Merge branch 'back_end_dev_danmo' into back_end_dev_1.0

linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeCustomer.java

@@ -136,6 +136,7 @@ public class WeCustomer extends BaseEntity {
     /**
      * 添加人员
      */
+    @ApiModelProperty("客户成员关联关系")
     @TableField(exist = false)
     private List<WeFlowerCustomerRelVo> weFlowerCustomerRels;
 
@@ -143,6 +144,7 @@ public class WeCustomer extends BaseEntity {
      * 客户标签
      */
     /** 微信用户添加的标签 */
+    @ApiModelProperty("客户标签")
     @TableField(exist = false)
     private List<WeTagVo>  weTags;
 
@@ -150,12 +152,14 @@ public class WeCustomer extends BaseEntity {
      * 添加人id
      */
     @TableField(exist = false)
+    @ApiModelProperty(value = "客户标签",hidden = true)
     private String userIds;
 
     /**
      * 标签
      */
     @TableField(exist = false)
+    @ApiModelProperty(value = "客户标签",hidden = true)
     private String tagIds;
 
 
@@ -163,18 +167,21 @@ public class WeCustomer extends BaseEntity {
      * 部门
      */
     @TableField(exist = false)
+    @ApiModelProperty(value = "客户标签",hidden = true)
     private String departmentIds;
 
     /**
      * 添加人名称
      */
     @TableField(exist = false)
+    @ApiModelProperty(value = "添加人名称")
     private String userName;
 
     /**
      * 员工id
      */
     @TableField(exist = false)
+    @ApiModelProperty(value = "客户标签",hidden = true)
     private String userId;
 
 }

linkwe-wecom/src/main/resources/mapper/wecom/WeGroupMapper.xml

@@ -62,7 +62,7 @@
 
 
     <insert id="insertBatch">
-        insert into we_group (chat_id, group_name, owner, add_time, notice, status, create_by, update_by,create_time,update_time)
+        insert into we_group (chat_id, group_name, owner, add_time, notice, status, create_by, create_time,update_by, update_time)
         values
         <foreach collection="weGroups" item="weGroup" index="index" separator=",">
             (#{weGroup.chatId},#{weGroup.groupName},#{weGroup.owner},#{weGroup.addTime},#{weGroup.notice},#{weGroup.status},