From ab4a935e57fea1066146e48c09476a9314a175ff Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 13:05:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/resources/web/template_1.json |  111 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/java110-generator/src/main/resources/web/template_1.json b/java110-generator/src/main/resources/web/template_1.json
old mode 100644
new mode 100755
index f891dd1..dc6c639
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,91 +1,126 @@
 {
-  "templateName": "鎷煎洟璁剧疆",
-  "directories": "goods",
-  "templateCode": "groupBuySetting",
-  "templateKey": "settingId",
-  "templateKeyName": "璁剧疆ID",
-  "searchCode": "settingId",
-  "searchName": "璁剧疆ID",
+  "templateName": "杩旂渷涓婃姤",
+  "templateCode": "reportInfoBackCity",
+  "templateKey": "backId",
+  "templateKeyName": "杩斿洖ID",
+  "searchCode": "backId",
+  "searchName": "杩斿洖ID",
+  "directories": "property",
   "conditions": [
     {
-      "name": "鎷煎洟鍚嶇О",
+      "name": "濮撳悕",
       "inputType": "input",
-      "code": "groupBuyName",
+      "code": "name",
       "whereCondition": "equal"
     },
     {
-      "name": "鎷煎洟鏃舵晥",
+      "name": "韬唤璇�",
       "inputType": "input",
-      "code": "validHours",
+      "code": "idCard",
       "whereCondition": "equal"
     },
     {
-      "name": "璁剧疆ID",
+      "name": "鎵嬫満鍙�",
       "inputType": "input",
-      "code": "settingId",
+      "code": "tel",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "鏉ユ簮鍦�",
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"鍥藉唴,鍥藉",
+      "code": "source",
       "whereCondition": "equal"
     }
   ],
   "columns": [
     {
-      "code": "groupBuyName",
-      "cnCode": "鎷煎洟鍚嶇О",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟鍚嶇О",
+      "code": "name",
+      "cnCode": "濮撳悕",
+      "desc": "蹇呭~锛岃濉啓濮撳悕",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
-      "limitParam": "256",
-      "limitErrInfo": "鎷煎洟鍚嶇О涓嶈兘瓒呰繃256浣�",
+      "limitParam": "64",
+      "limitErrInfo": "濮撳悕瓒呰繃64浣�",
       "show": true
     },
     {
-      "code": "groupBuyDesc",
-      "cnCode": "鎷煎洟绠�浠�",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟绠�浠�",
+      "code": "idCard",
+      "cnCode": "韬唤璇�",
+      "desc": "蹇呭~锛岃濉啓韬唤璇�",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
       "limit": "maxLength",
-      "limitParam": "500",
-      "limitErrInfo": "鎷煎洟绠�浠嬩笉鑳借秴杩�500浣�",
+      "limitParam": "64",
+      "limitErrInfo": "韬唤璇佷笉鑳戒负绌�",
       "show": true
     },
     {
-      "code": "validHours",
-      "cnCode": "鎷煎洟鏃舵晥",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟鏃舵晥",
+      "code": "tel",
+      "cnCode": "鎵嬫満鍙�",
+      "desc": "蹇呭~锛岃濉啓鎵嬫満鍙�",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
+      "limit": "phone",
+      "limitParam": "",
+      "limitErrInfo": "鎵嬫満鍙锋牸寮忛敊璇�",
+      "show": true
+    },
+    {
+      "code": "source",
+      "cnCode": "鏉ユ簮鍦�",
+      "desc": "蹇呭~锛岃濉啓鏉ユ簮鍦�",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"鍥藉唴,鍥藉",
       "limit": "num",
       "limitParam": "",
-      "limitErrInfo": "鎷煎洟鏃舵晥涓嶆槸鏈夋晥鏁板瓧",
+      "limitErrInfo": "鏉ユ簮鍦版牸寮忛敊璇�",
       "show": true
     },
     {
-      "code": "startTime",
-      "cnCode": "寮�濮嬫椂闂�",
-      "desc": "蹇呭~锛岃濉啓寮�濮嬫椂闂�",
+      "code": "sourceCityName",
+      "cnCode": "鍩庡競鍚嶇О",
+      "desc": "蹇呭~锛岃濉啓鍩庡競鍚嶇О",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
-      "limit": "datetime",
-      "limitParam": "",
-      "limitErrInfo": "寮�濮嬫椂闂翠笉鏄湁鏁堟棩鏈�",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "鍩庡競鍚嶇О鏍煎紡閿欒",
       "show": true
     },
     {
-      "code": "endTime",
-      "cnCode": "缁撴潫鏃堕棿",
-      "desc": "蹇呭~锛岃濉啓缁撴潫鏃堕棿",
+      "code": "backTime",
+      "cnCode": "杩斿洖鏃堕棿",
+      "desc": "蹇呭~锛岃濉啓杩斿洖鏃堕棿",
       "required": true,
       "hasDefaultValue": false,
       "inputType": "input",
-      "limit": "datetime",
+      "limit": "dateTime",
       "limitParam": "",
-      "limitErrInfo": "缁撴潫鏃堕棿涓嶆槸鏈夋晥鏃ユ湡",
+      "limitErrInfo": "杩斿洖鏃堕棿鏍煎紡閿欒",
       "show": true
+    },
+    {
+      "code": "remark",
+      "cnCode": "澶囨敞",
+      "desc": "鍙~锛岃濉啓澶囨敞",
+      "required": false,
+      "hasDefaultValue": false,
+      "defaultValue": "",
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "澶囨敞鍐呭涓嶈兘瓒呰繃200",
+      "show": false
     }
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0