update dt

南阳智慧农机系统-backup-202237121153.chnr.json → 南阳智慧农机系统-backup-202237140858.chnr.json

@@ -2,9 +2,9 @@
   "name": "南阳智慧农机系统",
   "describe": "南阳智慧农机系统",
   "avatar": "",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
-  "updatedTime": "2022-3-7 12:11:46",
+  "updatedTime": "2022-3-7 13:21:01",
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -344,7 +344,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "261px"
   },
   "entities": [
     {
@@ -558,7 +558,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -674,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"
@@ -763,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"
         }
       ],
@@ -1631,7 +1631,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -1788,7 +1788,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2106,7 +2106,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2270,8 +2270,8 @@
           "id": "E35C7D71-04B3-4277-AB78-2B6AB0D66792"
         },
         {
-          "defKey": "role",
-          "defName": "角色",
+          "defKey": "identity",
+          "defName": "身份",
           "comment": "农机手/合作社负责人",
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "type": "",
@@ -2287,7 +2287,23 @@
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
         {
-          "defKey": "create_data",
+          "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": "注册时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2297,7 +2313,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2494,7 +2510,23 @@
           "id": "313AC335-D45D-43EE-A1B9-B501E8CA9884"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
+          "id": "AE1F5851-1056-4261-B1B2-B1ED586FCF10"
+        },
+        {
+          "defKey": "update_date",
           "defName": "更新时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2701,7 +2733,7 @@
           "id": "77A9B1A0-3C56-4367-BC8E-7C1E5AF5F910"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2711,7 +2743,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2841,7 +2873,7 @@
           "id": "26D81AC9-AD90-4FCB-919B-7EF4D28298FB"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2851,7 +2883,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3042,7 +3074,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3233,7 +3265,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3440,7 +3472,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3645,7 +3677,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3962,7 +3994,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4119,7 +4151,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4276,7 +4308,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4467,7 +4499,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4658,7 +4690,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4897,7 +4929,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -5071,7 +5103,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",

南阳智慧农机系统-backup-202237121209.chnr.json → 南阳智慧农机系统-backup-202237140936.chnr.json

@@ -2,9 +2,9 @@
   "name": "南阳智慧农机系统",
   "describe": "南阳智慧农机系统",
   "avatar": "",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
-  "updatedTime": "2022-3-7 12:11:53",
+  "updatedTime": "2022-3-7 14:08:58",
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -344,7 +344,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "261px"
   },
   "entities": [
     {
@@ -558,7 +558,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -674,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"
@@ -763,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"
         }
       ],
@@ -1631,7 +1631,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -1788,7 +1788,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2106,7 +2106,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2270,8 +2270,8 @@
           "id": "E35C7D71-04B3-4277-AB78-2B6AB0D66792"
         },
         {
-          "defKey": "role",
-          "defName": "角色",
+          "defKey": "identity",
+          "defName": "身份",
           "comment": "农机手/合作社负责人",
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "type": "",
@@ -2287,7 +2287,23 @@
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
         {
-          "defKey": "create_data",
+          "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": "注册时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2297,7 +2313,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2494,7 +2510,23 @@
           "id": "313AC335-D45D-43EE-A1B9-B501E8CA9884"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
+          "id": "AE1F5851-1056-4261-B1B2-B1ED586FCF10"
+        },
+        {
+          "defKey": "update_date",
           "defName": "更新时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2701,7 +2733,7 @@
           "id": "77A9B1A0-3C56-4367-BC8E-7C1E5AF5F910"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2711,7 +2743,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2841,7 +2873,7 @@
           "id": "26D81AC9-AD90-4FCB-919B-7EF4D28298FB"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2851,7 +2883,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3042,7 +3074,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3233,7 +3265,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3440,7 +3472,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3645,7 +3677,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3962,7 +3994,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4119,7 +4151,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4276,7 +4308,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4467,7 +4499,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4658,7 +4690,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4897,7 +4929,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -5071,7 +5103,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",

南阳智慧农机系统-backup-202237155406.chnr.json

@@ -2,9 +2,13 @@
   "name": "南阳智慧农机系统",
   "describe": "南阳智慧农机系统",
   "avatar": "",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
+<<<<<<<< HEAD:南阳智慧农机系统-backup-202237155406.chnr.json
   "updatedTime": "2022-3-7 12:12:09",
+========
+  "updatedTime": "2022-3-7 13:19:24",
+>>>>>>>> 143532e4bbbb0f83ad81887207513fc42be27ac6:南阳智慧农机系统-backup-202237132101.chnr.json
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -344,7 +348,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "261px"
   },
   "entities": [
     {
@@ -558,7 +562,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -1631,7 +1635,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -1788,7 +1792,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2106,7 +2110,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2270,8 +2274,8 @@
           "id": "E35C7D71-04B3-4277-AB78-2B6AB0D66792"
         },
         {
-          "defKey": "role",
-          "defName": "角色",
+          "defKey": "identity",
+          "defName": "身份",
           "comment": "农机手/合作社负责人",
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "type": "",
@@ -2287,7 +2291,23 @@
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
         {
-          "defKey": "create_data",
+          "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": "注册时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2297,7 +2317,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2494,7 +2514,23 @@
           "id": "313AC335-D45D-43EE-A1B9-B501E8CA9884"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
+          "id": "AE1F5851-1056-4261-B1B2-B1ED586FCF10"
+        },
+        {
+          "defKey": "update_date",
           "defName": "更新时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2701,7 +2737,7 @@
           "id": "77A9B1A0-3C56-4367-BC8E-7C1E5AF5F910"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2711,7 +2747,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2841,7 +2877,7 @@
           "id": "26D81AC9-AD90-4FCB-919B-7EF4D28298FB"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2851,7 +2887,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3042,7 +3078,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3233,7 +3269,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3440,7 +3476,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3645,7 +3681,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3962,7 +3998,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4119,7 +4155,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4276,7 +4312,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4467,7 +4503,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4658,7 +4694,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4897,7 +4933,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -5071,7 +5107,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",

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

@@ -2,7 +2,7 @@
   "name": "南阳智慧农机系统",
   "describe": "南阳智慧农机系统",
   "avatar": "",
-  "version": "3.5.7",
+  "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
   "updatedTime": "2022-3-7 15:54:06",
   "profile": {
@@ -344,7 +344,7 @@
         "id": "9D79D555-980D-4F82-A17E-97192F8BBD1C"
       }
     ],
-    "menuWidth": "293px"
+    "menuWidth": "245px"
   },
   "entities": [
     {
@@ -541,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"
         },
         {
@@ -558,7 +558,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -674,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"
@@ -763,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"
         }
       ],
@@ -1400,6 +1400,22 @@
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "id": "868D735C-7F33-4394-93B3-6598E9210D58"
         },
+        {
+          "defKey": "job_status",
+          "defName": "工作状态",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
+          "id": "E9F5B88A-0ED0-4455-92A1-816C4960B8AE"
+        },
         {
           "defKey": "status",
           "defName": "状态",
@@ -1631,7 +1647,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -1788,7 +1804,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2106,7 +2122,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2270,8 +2286,8 @@
           "id": "E35C7D71-04B3-4277-AB78-2B6AB0D66792"
         },
         {
-          "defKey": "role",
-          "defName": "角色",
+          "defKey": "identity",
+          "defName": "身份",
           "comment": "农机手/合作社负责人",
           "domain": "CE02052D-E6C4-4ED8-BB44-24CB2550C912",
           "type": "",
@@ -2287,7 +2303,23 @@
           "id": "BAB618D7-597B-4676-BEF1-7168B03397A8"
         },
         {
-          "defKey": "create_data",
+          "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": "注册时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2297,7 +2329,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2494,7 +2526,23 @@
           "id": "313AC335-D45D-43EE-A1B9-B501E8CA9884"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
+          "defName": "创建时间",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "CURRENT_TIMESTAMP",
+          "hideInGraph": false,
+          "refDict": "",
+          "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
+          "id": "AE1F5851-1056-4261-B1B2-B1ED586FCF10"
+        },
+        {
+          "defKey": "update_date",
           "defName": "更新时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2701,7 +2749,7 @@
           "id": "77A9B1A0-3C56-4367-BC8E-7C1E5AF5F910"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2711,7 +2759,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -2841,7 +2889,7 @@
           "id": "26D81AC9-AD90-4FCB-919B-7EF4D28298FB"
         },
         {
-          "defKey": "create_data",
+          "defKey": "create_date",
           "defName": "创建时间",
           "comment": "",
           "domain": "0B348F62-B5F8-478F-9A4D-10EF1507EFAF",
@@ -2851,7 +2899,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3042,7 +3090,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3233,7 +3281,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3440,7 +3488,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3645,7 +3693,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -3962,7 +4010,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4119,7 +4167,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4276,7 +4324,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4467,7 +4515,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4658,7 +4706,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -4897,7 +4945,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",
@@ -5071,7 +5119,7 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "CURRENT_TIMESTAMP",
           "hideInGraph": false,
           "refDict": "",
           "uiHint": "",