李志伟 3 years ago
parent
commit
0ceef29d36

南阳智慧农机系统-backup-202237114304.chnr.json → 南阳智慧农机系统-backup-202237131331.chnr.json View File

@@ -4,11 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "3.5.6",
6 6
   "createdTime": "2022-3-3 17:23:46",
7
-<<<<<<<< HEAD:南阳智慧农机系统-backup-202237114304.chnr.json
8
-  "updatedTime": "2022-3-7 11:43:02",
9
-========
10
-  "updatedTime": "2022-3-7 11:31:32",
11
->>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121146.chnr.json
7
+  "updatedTime": "2022-3-7 13:09:03",
12 8
   "profile": {
13 9
     "default": {
14 10
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -348,7 +344,7 @@
348 344
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
349 345
       }
350 346
     ],
351
-    "menuWidth": "293px"
347
+    "menuWidth": "261px"
352 348
   },
353 349
   "entities": [
354 350
     {
@@ -2290,6 +2286,22 @@
2290 2286
           "uiHint": "",
2291 2287
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
2292 2288
         },
2289
+        {
2290
+          "defKey": "status",
2291
+          "defName": "状态",
2292
+          "comment": "",
2293
+          "type": "",
2294
+          "len": "",
2295
+          "scale": "",
2296
+          "primaryKey": false,
2297
+          "notNull": false,
2298
+          "autoIncrement": false,
2299
+          "defaultValue": "1",
2300
+          "hideInGraph": false,
2301
+          "refDict": "",
2302
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
2303
+          "id": "E968ED46-EF84-469D-B439-48C530C08254"
2304
+        },
2293 2305
         {
2294 2306
           "defKey": "create_date",
2295 2307
           "defName": "注册时间",

南阳智慧农机系统-backup-202237121146.chnr.json → 南阳智慧农机系统-backup-202237131512.chnr.json View File

@@ -4,11 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "3.5.6",
6 6
   "createdTime": "2022-3-3 17:23:46",
7
-<<<<<<<< HEAD:南阳智慧农机系统-backup-202237114304.chnr.json
8
-  "updatedTime": "2022-3-7 11:43:02",
9
-========
10
-  "updatedTime": "2022-3-7 11:31:32",
11
->>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121146.chnr.json
7
+  "updatedTime": "2022-3-7 13:13:31",
12 8
   "profile": {
13 9
     "default": {
14 10
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -348,7 +344,7 @@
348 344
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
349 345
       }
350 346
     ],
351
-    "menuWidth": "293px"
347
+    "menuWidth": "261px"
352 348
   },
353 349
   "entities": [
354 350
     {
@@ -2290,6 +2286,22 @@
2290 2286
           "uiHint": "",
2291 2287
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
2292 2288
         },
2289
+        {
2290
+          "defKey": "status",
2291
+          "defName": "状态",
2292
+          "comment": "",
2293
+          "type": "",
2294
+          "len": "",
2295
+          "scale": "",
2296
+          "primaryKey": false,
2297
+          "notNull": false,
2298
+          "autoIncrement": false,
2299
+          "defaultValue": "1",
2300
+          "hideInGraph": false,
2301
+          "refDict": "",
2302
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
2303
+          "id": "E968ED46-EF84-469D-B439-48C530C08254"
2304
+        },
2293 2305
         {
2294 2306
           "defKey": "create_date",
2295 2307
           "defName": "注册时间",

+ 9
- 13
南阳智慧农机系统.chnr.json View File

@@ -4,11 +4,7 @@
4 4
   "avatar": "",
5 5
   "version": "3.5.6",
6 6
   "createdTime": "2022-3-3 17:23:46",
7
-<<<<<<< HEAD
8
-  "updatedTime": "2022-3-7 13:09:03",
9
-=======
10
-  "updatedTime": "2022-3-7 12:12:09",
11
->>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767
7
+  "updatedTime": "2022-3-7 13:15:12",
12 8
   "profile": {
13 9
     "default": {
14 10
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -545,10 +541,10 @@
545 541
           "primaryKey": false,
546 542
           "notNull": false,
547 543
           "autoIncrement": false,
548
-          "defaultValue": "1",
544
+          "defaultValue": "",
549 545
           "hideInGraph": false,
550 546
           "refDict": "",
551
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
547
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
552 548
           "id": "89C51B66-8E2A-4435-980E-BB28EB0F4424"
553 549
         },
554 550
         {
@@ -678,14 +674,14 @@
678 674
           "defName": "登录id",
679 675
           "comment": "",
680 676
           "type": "",
681
-          "len": "",
677
+          "len": 32,
682 678
           "scale": "",
683 679
           "primaryKey": true,
684 680
           "notNull": true,
685
-          "autoIncrement": true,
681
+          "autoIncrement": false,
686 682
           "defaultValue": "",
687 683
           "hideInGraph": false,
688
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
684
+          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
689 685
           "refDict": "",
690 686
           "uiHint": "",
691 687
           "id": "18353C54-AD58-4735-AE02-7A3B1E6D8B48"
@@ -767,10 +763,10 @@
767 763
           "primaryKey": false,
768 764
           "notNull": false,
769 765
           "autoIncrement": false,
770
-          "defaultValue": "1",
766
+          "defaultValue": "",
771 767
           "hideInGraph": false,
772 768
           "refDict": "",
773
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
769
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
774 770
           "id": "8301DFB0-EA48-47B7-A9D3-7E75E29D5BBC"
775 771
         }
776 772
       ],
@@ -2275,7 +2271,7 @@
2275 2271
         },
2276 2272
         {
2277 2273
           "defKey": "role",
2278
-          "defName": "角色",
2274
+          "defName": "身份",
2279 2275
           "comment": "农机手/合作社负责人",
2280 2276
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
2281 2277
           "type": "",