Merge #18 into master from cc_20251114_minor_req

fix:订货信息新增订货备注并同步主数据；门店编码变更推送新管家

* cc_20251114_minor_req: (11 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch 'master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

  - fix:开店管理修改基本信息资料中门店编码发生变化时推送新管家

  - fix:订货信息新增订货备注并同步主数据

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/18

coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java

@@ -121,4 +121,8 @@ public class OrderSysInfoDO {
     /** 订货方式，0先款后货、1先货后款 */
     @Column(name = "order_type")
     private Integer orderType;
+
+    /** 订货备注 */
+    @Column(name = "order_remark")
+    private String orderRemark;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java

@@ -8,6 +8,7 @@ import com.cool.store.enums.SignTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -98,6 +99,10 @@ public class OrderSysInfoRequest {
 
     @ApiModelProperty("订货方式，0先款后货、1先货后款")
     private Integer orderType;
+
+    @ApiModelProperty("订货备注")
+    @Length(max = 200, message = "订货备注长度不能超过200")
+    private String orderRemark;
     
     public OrderSysInfoDO toOrderSysInfoDO() {
         OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();

coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java

@@ -91,6 +91,8 @@ public class StoreMasterDTO {
     private Integer declareGoodsType;
     @ApiModelProperty("报送货日期 数组格式\"[{\"declareGoods\": \"\",\"deliverGoods\":\"\"}]\"")
     private String declareGoodsDate;
+    @ApiModelProperty("订货备注")
+    private String orderRemark;
 
     @ApiModelProperty("营业时间")
     private String businessHours;

coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java

@@ -209,4 +209,7 @@ public class BuildInformationResponse {
 
     @ApiModelProperty("订货方式，0先款后货、1先货后款")
     private Integer orderType;
+
+    @ApiModelProperty("订货备注")
+    private String orderRemark;
 }