Merge #84 into master from cc_20260401_bugfix

feat：装修团队

* cc_20260401_bugfix: (2 commits squashed)

  - feat：推送数据

  - feat：装修团队

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

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

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

@@ -249,6 +249,10 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("特殊情况说明")
     private String specialInstruction;
 
+    private Date firstYearStartTime;
+
+    private Date firstYearEndTime;
+
 
     public SignFranchiseDO toSignFranchiseDO() {
         SignFranchiseDO signFranchiseDO = new SignFranchiseDO();

coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java

@@ -184,5 +184,7 @@ public class MiniStoreOrderDetailVO {
         private String expenseTypeCode;
 
         private BigDecimal defaultQuantity;
+
+        private String optionRemark;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreWishlistDetailVO.java

@@ -58,6 +58,12 @@ public class MiniStoreWishlistDetailVO {
         @ApiModelProperty("数量")
         private BigDecimal quantity;
 
+        private BigDecimal defaultQuantity;
+
+        private String optionUnit;
+
+        private String optionRemark;
+
         @ApiModelProperty("选项名称")
         private String optionName;