.

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

@@ -4,7 +4,11 @@
   "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
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",

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

@@ -4,7 +4,11 @@
   "avatar": "",
   "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
+<<<<<<<< HEAD:南阳智慧农机系统-backup-202237130621.chnr.json
   "updatedTime": "2022-3-7 11:43:04",
+========
+  "updatedTime": "2022-3-7 12:11:46",
+>>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121153.chnr.json
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -674,14 +678,14 @@
           "defName": "登录id",
           "comment": "",
           "type": "",
-          "len": 32,
+          "len": "",
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": false,
+          "autoIncrement": true,
           "defaultValue": "",
           "hideInGraph": false,
-          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "refDict": "",
           "uiHint": "",
           "id": "18353C54-AD58-4735-AE02-7A3B1E6D8B48"
@@ -763,10 +767,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "id": "8301DFB0-EA48-47B7-A9D3-7E75E29D5BBC"
         }
       ],

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

@@ -4,7 +4,11 @@
   "avatar": "",
   "version": "3.5.6",
   "createdTime": "2022-3-3 17:23:46",
+<<<<<<<< HEAD:南阳智慧农机系统-backup-202237130903.chnr.json
   "updatedTime": "2022-3-7 13:06:21",
+========
+  "updatedTime": "2022-3-7 12:11:53",
+>>>>>>>> e91e0c088c37e7beb2c4ba441d00c046b51b3767:南阳智慧农机系统-backup-202237121209.chnr.json
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -674,14 +678,14 @@
           "defName": "登录id",
           "comment": "",
           "type": "",
-          "len": 32,
+          "len": "",
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": false,
+          "autoIncrement": true,
           "defaultValue": "",
           "hideInGraph": false,
-          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "refDict": "",
           "uiHint": "",
           "id": "18353C54-AD58-4735-AE02-7A3B1E6D8B48"
@@ -763,10 +767,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "id": "8301DFB0-EA48-47B7-A9D3-7E75E29D5BBC"
         }
       ],

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

@@ -4,7 +4,11 @@
   "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
   "profile": {
     "default": {
       "db": "BCC84CFF-0541-44EC-A578-03D02506BD5B",
@@ -541,10 +545,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "id": "89C51B66-8E2A-4435-980E-BB28EB0F4424"
         },
         {
@@ -674,14 +678,14 @@
           "defName": "登录id",
           "comment": "",
           "type": "",
-          "len": 32,
+          "len": "",
           "scale": "",
           "primaryKey": true,
           "notNull": true,
-          "autoIncrement": false,
+          "autoIncrement": true,
           "defaultValue": "",
           "hideInGraph": false,
-          "domain": "FC46C793-A15E-495E-80C7-2BEC7A472CD0",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "refDict": "",
           "uiHint": "",
           "id": "18353C54-AD58-4735-AE02-7A3B1E6D8B48"
@@ -763,10 +767,10 @@
           "primaryKey": false,
           "notNull": false,
           "autoIncrement": false,
-          "defaultValue": "",
+          "defaultValue": "1",
           "hideInGraph": false,
           "refDict": "",
-          "domain": "4065DD45-6E7F-4C81-8D0A-0688748B3F0F",
+          "domain": "54DB65C2-2C8E-4C07-84E3-10D197A2530E",
           "id": "8301DFB0-EA48-47B7-A9D3-7E75E29D5BBC"
         }
       ],