111

db/.back_文明创办/文明创办-backup-2023330100554.pdma.json → db/.back_文明创办/文明创办-backup-2023518101923.pdma.json

   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-27 19:12:07",
+  "updatedTime": "2023-5-10 11:56:46",
   "dbConns": [],
   "profile": {
     "default": {
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
           "domain": "",
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
+        {
+          "defKey": "loc_num",
+          "defName": "实地测评份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
+        },
+        {
+          "defKey": "survey_num",
+          "defName": "调查问卷份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/.back_文明创办/文明创办-backup-2023510115646.pdma.json → db/.back_文明创办/文明创办-backup-2023518112005.pdma.json

   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-11 16:31:13",
+  "updatedTime": "2023-5-18 10:19:23",
   "dbConns": [],
   "profile": {
     "default": {
           "extProps": {},
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
-        },
-        {
-          "defKey": "source_type2",
-          "defName": "问题来源PC",
-          "comment": "check 模拟测评  feedback 市民上报  inspector 督查员上报",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "extProps": {},
-          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
-          "id": "42892AD2-FF8E-4D87-8705-14737E34AE9A"
         }
       ],
       "correlations": [],
           "refDict": "",
           "extProps": {},
           "id": "0279B08D-E12C-4409-8253-A5D7766A7133"
+        },
+        {
+          "defKey": "card_title",
+          "defName": "卡片名称",
+          "comment": "小程序端，新建定位时显示的名称",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "7ECA8243-FCF7-4539-A9AE-17E0DA920AD4"
         }
       ],
       "correlations": [],

db/.back_文明创办/文明创办-backup-2023415134743.pdma.json → db/.back_文明创办/文明创办-backup-2023518112034.pdma.json

   "name": "文明创办",
   "describe": "文明创办",
   "avatar": "",
-  "version": "4.1.4",
+  "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-3-30 10:05:54",
+  "updatedTime": "2023-5-18 11:20:05",
   "dbConns": [],
   "profile": {
     "default": {
         "hideInGraph": true
       }
     ],
-    "modelType": "modalGroup"
+    "modelType": "modalGroup",
+    "menuWidth": "250px"
   },
   "entities": [
     {
           "domain": "",
           "id": "52C74C06-CC1C-416E-B913-78B500CE30A2"
         },
+        {
+          "defKey": "loc_num",
+          "defName": "实地测评份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "FC14EB4B-E1C2-411A-A051-0D3C15002B61"
+        },
+        {
+          "defKey": "survey_num",
+          "defName": "调查问卷份数",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "DAA70103-78D7-46A9-98F8-87963984C229"
+        },
         {
           "defKey": "status",
           "defName": "状态",

db/upgrade.1.1.sql

 ALTER TABLE `ta_issue`
 ADD COLUMN source_type2 varchar(32) NULL COMMENT 'PC问题来源: check 模拟测评  feedback 市民上报  inspector 督查员上报' AFTER copy_from;
 
+<<<<<<< HEAD
+=======
+ALTER TABLE `ta_check_answer`
+    ADD COLUMN `card_title` varchar(255) NULL COMMENT '卡片名称(小程序端，新建定位时显示的名称)' AFTER `user_name`;
+>>>>>>> 09c481190cc5ad63c138fc86136b4595e7934ae3

db/文明创办.pdma.json

   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-10 11:56:46",
+  "updatedTime": "2023-5-18 11:20:34",
   "dbConns": [],
   "profile": {
     "default": {
           "refDict": "",
           "uiHint": "",
           "id": "A836C724-F5D9-4A45-A413-209B55DDA976"
+        },
+        {
+          "defKey": "card_title",
+          "defName": "卡片名称",
+          "comment": "小程序端，新建定位时显示的名称",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "1CDF0BAA-5F46-498F-A791-FD71F33EB3D5"
         }
       ],
       "correlations": [],

src/main/java/com/example/civilizedcity/entity/TaCheckAnswer.java

      @TableField(exist = false)
      @ApiModelProperty(name = "点位名称",notes = "")
      private String typeName ;
+
+
+     /** 卡片名称 */
+     @ApiModelProperty(name = "卡片名称",notes = "")
+     private String cardTitle ;
 }

src/main/java/com/example/civilizedcity/entity/TaCheckItem.java

     @TableField(exist = false)
     @ApiModelProperty(name = "是否只读, 只读代表不需要答题")
     private Integer answerNum;
+
 }