From b5e47a74ad88c453bf82fb8b870b69ac9d45503f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 06 八月 2021 16:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-generator/src/main/resources/newBack/template_1.json | 67 ++++++++++-----------------------
1 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/java110-generator/src/main/resources/newBack/template_1.json b/java110-generator/src/main/resources/newBack/template_1.json
index fded289..4adf50f 100755
--- a/java110-generator/src/main/resources/newBack/template_1.json
+++ b/java110-generator/src/main/resources/newBack/template_1.json
@@ -1,74 +1,47 @@
{
"autoMove": true,
-<<<<<<< HEAD
- "id": "anValueId",
- "name": "reportInfoAnswerValue",
- "desc": "鎵归噺鎿嶄綔鏃ュ織璇︽儏",
+ "id": "titleId",
+ "name": "reportInfoSettingTitle",
+ "desc": "杩涘嚭涓婃姤棰樼洰璁剧疆",
"shareParam": "communityId",
"shareColumn": "community_id",
"shareName": "report",
- "tableName": "report_info_answer_value",
+ "tableName": "report_info_setting_title",
"param": {
- "anValueId": "an_value_id",
- "userAnId": "user_an_id",
- "settingId": "setting_id",
"titleId": "title_id",
- "valueId": "value_id",
- "valueContent": "value_content",
+ "settingId": "setting_id",
+ "title": "title",
+ "titleType": "title_type",
+ "seq": "seq",
"communityId": "community_id",
"createTime": "create_time",
-=======
- "id": "backId",
- "name": "reportInfoBackCity",
- "desc": "杩旂渷涓婃姤",
- "shareParam": "communityId",
- "shareColumn": "community_id",
- "shareName": "report",
- "tableName": "report_info_back_city",
- "param": {
- "backId": "back_id",
- "name": "name",
- "communityId": "community_id",
- "idCard": "id_card",
- "tel": "tel",
- "source": "source",
- "sourceCity": "source_city",
- "sourceCityName": "source_city_name",
- "backTime": "back_time",
- "userId": "user_id",
- "remark": "remark",
->>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
"statusCd": "status_cd"
},
"required": [
{
- "code": "anValueId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
- },
- {
- "code": "userAnId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "code": "titleId",
+ "msg": "鍚堝悓ID涓嶈兘涓虹┖"
},
{
"code": "settingId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "msg": "鍟嗘埛ID涓嶈兘涓虹┖"
},
{
- "code": "titleId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "code": "title",
+ "msg": "鐢ㄦ埛瑙勬牸涓嶈兘涓虹┖"
},
{
- "code": "valueId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "code": "titleType",
+ "msg": "鐢ㄦ埛瑙勬牸涓嶈兘涓虹┖"
},
{
- "code": "valueContent",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "code": "seq",
+ "msg": "鐢ㄦ埛瑙勬牸涓嶈兘涓虹┖"
},
{
"code": "communityId",
- "msg": "灏忓尯涓嶈兘涓虹┖"
+ "msg": "鐢ㄦ埛瑙勬牸涓嶈兘涓虹┖"
}
-
]
-}
\ No newline at end of file
+}
+
--
Gitblit v1.8.0