Merge branch 'master' into cc_20250529_login

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-model/src/main/java/com/cool/store/dto/ImportOaOldShopDataErrorDTO.java

@@ -19,4 +19,13 @@ public class ImportOaOldShopDataErrorDTO {
     @ExcelProperty(value = "错误原因", order = 2)
     @ColumnWidth(40)
     private String errorReason;
+
+    public ImportOaOldShopDataErrorDTO() {
+
+    }
+
+    public ImportOaOldShopDataErrorDTO(String shopCode, String errorReason) {
+        this.shopCode = shopCode;
+        this.errorReason = errorReason;
+    }
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java

@@ -53,4 +53,7 @@ public class PreparationCommonPendingVO {
     private Integer signType;
     @ApiModelProperty("业务备注")
     private String businessRemark;
+
+    @ApiModelProperty("签约人2姓名")
+    private String partnershipSignatorySecond;
 }