Merge branch 'dev' into test

package.json

@@ -44,7 +44,7 @@
     "braft-editor": "^2.3.9",
     "classnames": "^2.2.6",
     "core-js": "^3.6.5",
-    "god": "0.1.28",
+    "god": "0.1.29",
     "lingxi-design": "^1.0.8",
     "lingxi-design-ui": "^1.1.10",
     "lingxi-editor-core": "^1.0.6",

src/pages/authConfig/userSystem/schema/index.ts

@@ -19,22 +19,28 @@ export const UserDetailSchema:ISchema = {
           title: '登录账号',
           "x-rules": [
             {
+              required: true,
+              message: '请输入登录账号'
+            },
+            {
               pattern: /^\w{6,20}$/,
               message: '请输入由数字字母或者下划线组成的6-20位账号'
             }
-          ],
-          required: true
+          ]
         },
         password: {
           type: 'password',
           title: '登录密码',
           "x-rules": [
             {
+              required: true,
+              message: '请输入登录密码'
+            },
+            {
               pattern: PATTERN_MAPS.password,
               message: '请输入由大小写字母和数字组成的8位密码'
             }
           ],
-          required: true
         },
         name: {
           type: 'string',

src/pages/comment/query/index.tsx

@@ -115,7 +115,7 @@ const CommentQuery = () => {
     <Card>
       <StandardTable
         tableProps={{
-          rowKey: (record, index) => `${record.memberId}+${record.roleId}+${index}`,
+          rowKey: record => `${record.memberId}+${record.roleId}`,
         }}
         columns={columns}
         currentRef={ref}

yarn.lock

@@ -7233,10 +7233,10 @@ god-yapi2ts@^1.6.0:
     tslib "^1.9.3"
     vtils "^2.55.0"
 
-god@0.1.28:
-  version "0.1.28"
-  resolved "http://10.0.0.21:8081/repository/node-group/god/-/god-0.1.28.tgz#e0a832a37079a931e80d0f9292f72ff71b1b282a"
-  integrity sha512-hX/umtt4AQOhqeRqc06A2qZTNejhNinx2cKEnNrF5HsEOzOfdDJmhTqEi3RO/oo3m3pD/3dWcqGpQlW6zwS/VQ==
+god@0.1.29:
+  version "0.1.29"
+  resolved "http://10.0.0.21:8081/repository/node-group/god/-/god-0.1.29.tgz#512ce7124adfb80e297c3009b88c85252857c635"
+  integrity sha512-mzIQFUJTWsaY9WR9c+/AD8UwXVC/gbAaQGbmf5orI9cqx5SIAnX/p6Verf5Fwdx0py5+Uw0Oo8ZQ/GRdb6gvUg==
   dependencies:
     "@ant-design/icons" "^4.1.0"
     "@umijs/route-utils" "^1.0.12"