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

# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java

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

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

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

@@ -50,6 +50,9 @@ public class ZxjpApiRequest {
     @ApiModelProperty(value = "下游系统密码盐值")
     private String  downstreamSystemSalt;
 
+    @ApiModelProperty(value = "第二密码")
+    private String  downstreamSystemSecondaryPassword;
+
     @ApiModelProperty(value = "下游系统店铺名称")
     private String downstreamSystemShopName;
 

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

@@ -0,0 +1,18 @@
+package com.cool.store.response;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/11/10:57
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class XgjBaseResponse<T> {
+    private String retMsg;
+    private int retCode;
+    private T retData;
+}

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

@@ -0,0 +1,22 @@
+package com.cool.store.response;
+
+import com.cool.store.dto.XgjOrganizationDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/11/13:38
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class XgjOrganizationResponse {
+    List<XgjOrganizationDTO> list;
+}