Merge branch 'master_cj_zq' into master_sample_order

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/customer/FlowTaskServiceImpl.java

@@ -161,7 +161,7 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
     /**
      * 是否冻结
      */
-    private boolean freeze;
+    private Boolean freeze;
 
     /**
      * 冻结次数

@@ -278,7 +278,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     /**
      * 是否冻结
      */
-    private boolean freeze;
+    private Boolean freeze;
 
     /**
      * 冻结次数

@@ -626,7 +626,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             return;
         }
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
-        updateWrapper.set(PurchaseOrderInfo::isFreeze, false)
+        updateWrapper.set(PurchaseOrderInfo::getFreeze, false)
                 .in(PurchaseOrderInfo::getId, ids);
         getBaseMapper().update(updateWrapper);
     }
@@ -637,7 +637,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             return;
         }
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
-        updateWrapper.set(PurchaseOrderInfo::isFreeze, Boolean.TRUE)
+        updateWrapper.set(PurchaseOrderInfo::getFreeze, Boolean.TRUE)
                 .setSql("freeze_count = freeze_count + 1")
                 .in(PurchaseOrderInfo::getId, ids);
         getBaseMapper().update(updateWrapper);

@@ -282,11 +282,11 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         }
         LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
         if (flag) {
-            updateWrapper.set(DraftRequestCarTicket::isFreeze, true)
+            updateWrapper.set(DraftRequestCarTicket::getFreeze, true)
                     .setSql("freeze_count = freeze_count + 1")
                     .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
         } else {
-            updateWrapper.set(DraftRequestCarTicket::isFreeze, false)
+            updateWrapper.set(DraftRequestCarTicket::getFreeze, false)
                     .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
         }
         getBaseMapper().update(updateWrapper);