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

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (新增权限分组´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (角色操作表新增字段´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/RoleOperateParam.java

@@ -79,4 +79,16 @@ public class RoleOperateParam {
     @ApiModelProperty("GS账号")
     private Long gsAccount;
 
+    /**
+     * 企业id
+     */
+    @ApiModelProperty("企业id")
+    private String corpId;
+
+    /**
+     * 企微客户id
+     */
+    @ApiModelProperty("企微客户id")
+    private String externalUserId;
+
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleOperateServiceImpl.java

@@ -60,6 +60,8 @@ public class RoleOperateServiceImpl extends ServiceImpl<RoleOperateMapper, RoleO
                     roleOperate.setRoleId(item.getRoleId());
                     roleOperate.setIsChangeGameType(param.getIsChangeGameType());
                     roleOperate.setIsAddCorpWechat(param.getIsAddCorpWechat());
+                    roleOperate.setCorpId(param.getCorpId());
+                    roleOperate.setExternalUserId(param.getExternalUserId());
                     roleOperate.setAddCorpUserId(param.getAddCorpUserId());
                     roleOperate.setUserWechat(param.getUserWechat());
                     roleOperate.setUserPhone(param.getUserPhone());

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/RoleOperate.java

@@ -68,6 +68,18 @@ public class RoleOperate implements Serializable {
      */
     private Integer isAddCorpWechat;
 
+    /**
+     * 企业id
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String corpId;
+
+    /**
+     * 企微客户id
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String externalUserId;
+
     /**
      * 企微号
      */