Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

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

@@ -13,10 +13,14 @@ import java.util.List;
 @Data
 public class ModifyPasswordDTO {
 
+    @ApiModelProperty(value = "手机号",hidden = true)
+    private String mobile;
     @ApiModelProperty(value = "盐值",required = true)
     String passwordSalt;
     @ApiModelProperty(value = "密码",required = true)
     String password;
+    @ApiModelProperty(value = "第二密码",required = true)
+    String passwordSecondary;
     @ApiModelProperty(value = "门店ID",required = true)
     Long shopId;
     @ApiModelProperty(value = "门店ID",hidden = true)

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

@@ -57,4 +57,8 @@ public class HyPartnerUserInfoDO implements Serializable {
     @ApiModelProperty("下游系统密码")
     @Column(name = "downstream_system_password")
     private String downstreamSystemPassword;
+
+    @ApiModelProperty("下游系统第二密码")
+    @Column(name = "downstream_system_Secondary_password")
+    private String downstreamSystemSecondaryPassword;
 }

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

@@ -49,6 +49,11 @@ public class ShopAccountDO {
      */
     private String password;
 
+    /**
+     * 第二密码
+     */
+    private String secondaryPassword;
+
     /**
      * 状态：1-开通资料收集中, 2-资料审核中, 3-资料审核失败, 4-开通中, 5-开通成功, 6-开通失败
      */