.

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

@@ -4,11 +4,7 @@
   "avatar": "",
   "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
-<<<<<<<< HEAD:南阳智慧农机系统-backup-202237114304.chnr.json
-  "updatedTime": "2022-3-7 11:43:02",
-========
-  "updatedTime": "2022-3-7 11:31:32",
->>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121146.chnr.json
+  "updatedTime": "2022-3-7 13:09:03",
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -348,7 +344,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "261px"
   },
   "entities": [
     {
@@ -2290,6 +2286,22 @@
           "uiHint": "",
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
+          "id": "E968ED46-EF84-469D-B439-48C530C08254"
+        },
         {
           "defKey": "create_date",
           "defName": "注册时间",

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

@@ -4,11 +4,7 @@
   "avatar": "",
   "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
-<<<<<<<< HEAD:南阳智慧农机系统-backup-202237114304.chnr.json
-  "updatedTime": "2022-3-7 11:43:02",
-========
-  "updatedTime": "2022-3-7 11:31:32",
->>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121146.chnr.json
+  "updatedTime": "2022-3-7 13:13:31",
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -348,7 +344,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "261px"
   },
   "entities": [
     {
@@ -2290,6 +2286,22 @@
           "uiHint": "",
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "1",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
+          "id": "E968ED46-EF84-469D-B439-48C530C08254"
+        },
         {
           "defKey": "create_date",
           "defName": "注册时间",

南阳智慧农机系统.chnr.json

@@ -4,11 +4,7 @@
   "avatar": "",
   "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
-<<<<<<< HEAD
-  "updatedTime": "2022-3-7 13:09:03",
-=======
-  "updatedTime": "2022-3-7 12:12:09",
->>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767
+  "updatedTime": "2022-3-7 13:15:12",
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -545,10 +541,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "1",
+          "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
           "id": "89C51B66-8E2A-4435-980E-BB28EB0F4424"
         },
         {
@@ -678,14 +674,14 @@
           "defName": "登录id",
           "comment": "",
           "type": "",
-          "len": "",
+          "len": 32,
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": true,
+          "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
+          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
           "refDict": "",
           "uiHint": "",
           "id": "18353C54-AD58-4735-AE02-7A3B1E6D8B48"
@@ -767,10 +763,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "1",
+          "defaultValue": "",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
+          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
           "id": "8301DFB0-EA48-47B7-A9D3-7E75E29D5BBC"
         }
       ],
@@ -2275,7 +2271,7 @@
         },
         {
           "defKey": "role",
-          "defName": "角色",
+          "defName": "身份",
           "comment": "农机手/合作社负责人",
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "type": "",