feats

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/upgrade.1.2.sql

+
+ALTER TABLE `ta_check_answer`
+    ADD COLUMN `card_title` varchar(255) NULL COMMENT '卡片名称(小程序端，新建定位时显示的名称)' AFTER `user_name`;

pom.xml

     </parent>
     <groupId>com.example</groupId>
     <artifactId>civilizedCity</artifactId>
-    <version>0.0.18</version>
+    <version>0.0.19</version>
     <name>civilizedCity</name>
     <description>civilizedCity</description>
     <properties>