Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -125,7 +125,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `standard_approved`          varchar(20) COMMENT '标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)',
     `standard_approver_id`       varchar(32) COMMENT '标准合同审批人ID',
     `standard_time`               datetime COMMENT '标准合同审批完成时间',
-    `price_spec_locked`          TINYINT(1) DEFAULT FALSE COMMENT '是否已完成锁价/锁规',
+    `price_spec_locked`          TINYINT(1) COMMENT '是否已完成锁价/锁规',
     `create_by_id`               varchar(32)  not null comment '创建人ID',
     `create_by`                  varchar(20)  not null comment '创建人',
     `update_by_id`               varchar(32)  not null comment '更新人ID',

@@ -183,7 +183,7 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
      * 是否已完成锁价/锁规
      */
     @ApiModelProperty(value = "是否已完成锁价/锁规")
-    private boolean priceSpecLocked;
+    private Boolean priceSpecLocked;
 
     public QueryContractDistributorStandardBo() {
 

@@ -296,7 +296,7 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     /**
      * 是否已完成锁价/锁规
      */
-    private boolean priceSpecLocked;
+    private Boolean priceSpecLocked;
 
     /**
      * 是否展示正式合同审核按钮(非持久化字段)

@@ -523,7 +523,7 @@ public class ContractDistributorStandardServiceImpl extends
         }
 
         Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
-                .set(ContractDistributorStandard::isPriceSpecLocked, true)
+                .set(ContractDistributorStandard::getPriceSpecLocked, true)
                 .eq(ContractDistributorStandard::getId, vo.getId());
         getBaseMapper().update(changeLocked);