Merge branch 'dev' of git.kingsome.cn:server/game2006go into dev

doc/admin/UserGroup.js

@@ -50,7 +50,7 @@ module.exports = class {
         'is_json_params': true,
         'params': [
           new common.RspHead(),
-          ['group_id', 0, '组id'],
+          ['group_id', '', '组id'],
           ['group_name', '', '组名'],
           ['group_desc', '', '描述'],
           ['enabled', 0, '是否启用'],

doc/admin/UserGroupMember.js

@@ -0,0 +1,64 @@
+const common = require('./common');
+
+module.exports = class {
+
+  constructor() {
+    this.apis = [
+      {
+        'method': 'GET',
+        'name': 'list',
+        'desc': '获取用户组成员列表',
+        'group': 'user_group_member',
+        'url': 'api/v1/user_group/member/list',
+        'header': [
+        ],
+        'is_json_params': true,
+        'params': [
+        ],
+        'response': [
+          new common.RspHead(),
+          ['!data', common.UserGroupMember()]
+        ]
+      },
+      {
+        'method': 'POST',
+        'name': 'add',
+        'desc': '添加用户组成员',
+        'group': 'user_group_member',
+        'url': 'api/v1/user_group/member/add',
+        'header': [
+        ],
+        'is_json_params': true,
+        'params': [
+          new common.RspHead(),
+          ['group_id', '', '组id'],
+          ['member_id', '', '成员id'],
+          ['enabled', 0, '是否启用'],
+        ],
+        'response': [
+          new common.RspHead(),
+        ]
+      },
+      {
+        'method': 'POST',
+        'name': 'add',
+        'desc': '编辑用户组成员',
+        'group': 'user_group_member',
+        'url': 'api/v1/user_group/member/edit',
+        'header': [
+        ],
+        'is_json_params': true,
+        'params': [
+          new common.RspHead(),
+          ['group_id', 0, '组id'],
+          ['member_id', '', '成员id'],
+          ['enabled', 0, '是否启用'],
+        ],
+        'response': [
+          new common.RspHead(),
+        ]
+      },
+    ];
+  }
+
+};

doc/admin/common.js

@@ -78,3 +78,17 @@ exports.UserGroup = class {
     }
 
 };
+
+exports.UserGroupMember = class {
+
+    constructor() {
+      this.fields = [
+        ['group_id', '', '组id'],
+        ['member_id', '', '成员id'],
+        ['deleted', 0, '是否已删除'],
+        ['createtime', 0, '创建时间'],
+        ['modifytime', 0, '修改时间'],
+      ];
+    }
+
+};