批量分组接口修复：sql语法错误

gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorDTO.java

@@ -36,10 +36,16 @@ public class CollaboratorDTO implements Serializable{
     /**
      * 商户
      */
-    @NotNull(message = "商户ID不能为空", groups = {SaveValid.class})
+    @NotNull(message = "主体商户ID不能为空", groups = {SaveValid.class})
     private Integer enterpriseId;
 
     /**
+     * 协作商户
+     */
+    @NotNull(message = "协作商户ID不能为空", groups = {SaveValid.class})
+    private Integer collaborationEnterpriseId;
+
+    /**
      * 手机号码
      */
     @NotBlank(message = "手机号码不能为空", groups = {SaveValid.class})
@@ -170,4 +176,12 @@ public class CollaboratorDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getCollaborationEnterpriseId() {
+        return collaborationEnterpriseId;
+    }
+
+    public void setCollaborationEnterpriseId(Integer collaborationEnterpriseId) {
+        this.collaborationEnterpriseId = collaborationEnterpriseId;
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorListDTO.java

@@ -28,7 +28,12 @@ public class CollaboratorListDTO implements Serializable{
      */
     private Integer enterpriseId;
 
-    private String enterpriseName;
+    /**
+     * 协作商户
+     */
+    private Integer collaborationEnterpriseId;
+
+    private String collaborationEnterpriseName;
 
     /**
      * 手机号码
@@ -83,12 +88,20 @@ public class CollaboratorListDTO implements Serializable{
         this.enterpriseId = enterpriseId;
     }
 
-    public String getEnterpriseName() {
-        return enterpriseName;
+    public Integer getCollaborationEnterpriseId() {
+        return collaborationEnterpriseId;
+    }
+
+    public void setCollaborationEnterpriseId(Integer collaborationEnterpriseId) {
+        this.collaborationEnterpriseId = collaborationEnterpriseId;
     }
 
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
+    public String getCollaborationEnterpriseName() {
+        return collaborationEnterpriseName;
+    }
+
+    public void setCollaborationEnterpriseName(String collaborationEnterpriseName) {
+        this.collaborationEnterpriseName = collaborationEnterpriseName;
     }
 
     public String getPhone() {
@@ -138,4 +151,6 @@ public class CollaboratorListDTO implements Serializable{
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+
 }

gic-platform-auth-api/src/main/java/com/gic/auth/qo/CollaboratorListQO.java

@@ -22,6 +22,8 @@ public class CollaboratorListQO extends PageQO{
 
     private Integer status;
 
+    private Integer enterpriseId;
+
     public String getSearch() {
         return search;
     }
@@ -45,4 +47,12 @@ public class CollaboratorListQO extends PageQO{
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }