Merge branch 'master-fix' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -627,4 +627,11 @@ public class OrderDO extends BaseDO {
     @ApiModelProperty(value = "是否在公海")
     private Boolean isInOpenSea;
 
+
+
+
+    @ApiModelProperty(value = "订单修改是否变动了归属客户，此字段用来判定订单是否需要重置归属客户经理，下单后归属客户的客户经理是固定的，除非订单归属客户变动，才需要重置客户经理")
+    @TableField(exist = false)
+    private Boolean isChargeCustomer;
+
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java

@@ -587,6 +587,11 @@ public class OrderBackVO {
     private Boolean isInOpenSea;
 
 
+    @ApiModelProperty(value = "订单修改是否变动了归属客户，此字段用来判定订单是否需要重置归属客户经理，下单后归属客户的客户经理是固定的，除非订单归属客户变动，才需要重置客户经理")
+    @TableField(exist = false)
+    private Boolean isChargeCustomer;
+
+
     public void setExternalWarehouseJson(String externalWarehouseJson) {
         this.externalWarehouseJson = externalWarehouseJson;
         if (StringUtils.isNotBlank(externalWarehouseJson)) {