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 |  257 +++++++++++++++++----------------------------------
 1 files changed, 85 insertions(+), 172 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 f247163..dc6c639
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,212 +1,125 @@
 {
-  "templateName":"鍚堝悓淇℃伅",
-  "directories": "admin",
-  "templateCode":"contract",
-  "templateKey":"contractId",
-  "templateKeyName":"鍚堝悓ID",
-  "searchCode": "contractId",
-  "searchName": "鍚堝悓ID",
+  "templateName": "杩旂渷涓婃姤",
+  "templateCode": "reportInfoBackCity",
+  "templateKey": "backId",
+  "templateKeyName": "杩斿洖ID",
+  "searchCode": "backId",
+  "searchName": "杩斿洖ID",
+  "directories": "property",
   "conditions": [
     {
-      "name": "鍚堝悓鍚嶇О",
+      "name": "濮撳悕",
       "inputType": "input",
-      "code": "contractName",
+      "code": "name",
       "whereCondition": "equal"
     },
     {
-      "name": "鍚堝悓缂栧彿",
+      "name": "韬唤璇�",
       "inputType": "input",
-      "code": "contractCode",
+      "code": "idCard",
       "whereCondition": "equal"
     },
     {
-      "name": "鍚堝悓绫诲瀷",
+      "name": "鎵嬫満鍙�",
       "inputType": "input",
-      "code": "contractType",
+      "code": "tel",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "鏉ユ簮鍦�",
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"鍥藉唴,鍥藉",
+      "code": "source",
       "whereCondition": "equal"
     }
   ],
-  "columns":[
+  "columns": [
     {
-      "code": "contractName",
-      "cnCode":"鍚堝悓鍚嶇О",
-      "desc":"蹇呭~锛岃濉啓鍚堝悓鍚嶇О",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "name",
+      "cnCode": "濮撳悕",
+      "desc": "蹇呭~锛岃濉啓濮撳悕",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"鍚堝悓鍚嶇О涓嶈兘瓒呰繃64浣�",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "濮撳悕瓒呰繃64浣�",
       "show": true
     },
     {
-      "code": "contractCode",
-      "cnCode":"鍚堝悓缂栧彿",
-      "desc":"閫夊~锛岃濉啓鍚堝悓缂栧彿",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "idCard",
+      "cnCode": "韬唤璇�",
+      "desc": "蹇呭~锛岃濉啓韬唤璇�",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"30",
-      "limitErrInfo":"鍚堝悓缂栧彿閿欒",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "韬唤璇佷笉鑳戒负绌�",
       "show": true
     },
     {
-      "code": "contractType",
-      "cnCode":"鍚堝悓绫诲瀷",
-      "desc":"蹇呭~锛岃閫夋嫨鍚堝悓绫诲瀷",
-      "required":true,
-      "hasDefaultValue":false,
+      "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":"10001,10002",
-      "selectValueName":"灏忓尯鏂囧寲,鍏朵粬",
-      "limit":"num",
-      "limitParam":"",
-      "limitErrInfo":"鍚堝悓绫诲瀷鏍煎紡閿欒",
+      "selectValue":"1001,2002",
+      "selectValueName":"鍥藉唴,鍥藉",
+      "limit": "num",
+      "limitParam": "",
+      "limitErrInfo": "鏉ユ簮鍦版牸寮忛敊璇�",
       "show": true
     },
     {
-      "code": "partyA",
-      "cnCode":"鐢叉柟",
-      "desc":"蹇呭~锛岃濉啓鐢叉柟",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "sourceCityName",
+      "cnCode": "鍩庡競鍚嶇О",
+      "desc": "蹇呭~锛岃濉啓鍩庡競鍚嶇О",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"鐢叉柟鍚嶇О澶暱",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "鍩庡競鍚嶇О鏍煎紡閿欒",
       "show": true
     },
     {
-      "code": "partyB",
-      "cnCode":"涔欐柟",
-      "desc":"蹇呭~锛岃濉啓涔欐柟",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "backTime",
+      "cnCode": "杩斿洖鏃堕棿",
+      "desc": "蹇呭~锛岃濉啓杩斿洖鏃堕棿",
+      "required": true,
+      "hasDefaultValue": false,
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"涔欐柟鍚嶇О澶暱",
+      "limit": "dateTime",
+      "limitParam": "",
+      "limitErrInfo": "杩斿洖鏃堕棿鏍煎紡閿欒",
       "show": true
     },
     {
-      "code": "aContacts",
-      "cnCode":"鐢叉柟鑱旂郴浜�",
-      "desc":"蹇呭~锛岃濉啓鐢叉柟鑱旂郴浜�",
-      "required":true,
-      "hasDefaultValue":false,
+      "code": "remark",
+      "cnCode": "澶囨敞",
+      "desc": "鍙~锛岃濉啓澶囨敞",
+      "required": false,
+      "hasDefaultValue": false,
+      "defaultValue": "",
       "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
-      "show": false
-    },
-    {
-      "code": "bContacts",
-      "cnCode":"涔欐柟鑱旂郴浜�",
-      "desc":"蹇呭~锛岃濉啓鐢叉柟鑱旂郴浜�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
-      "show": false
-    },
-    {
-      "code": "aLink",
-      "cnCode":"鐢叉柟鑱旂郴鐢佃瘽",
-      "desc":"蹇呭~锛岃濉啓鐢叉柟鑱旂郴鐢佃瘽",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"phone",
-      "limitParam":"",
-      "limitErrInfo":"鐢叉柟鑱旂郴鐢佃瘽閿欒",
-      "show": false
-    },
-    {
-      "code": "bLink",
-      "cnCode":"涔欐柟鑱旂郴鐢佃瘽",
-      "desc":"蹇呭~锛岃濉啓涔欐柟鑱旂郴鐢佃瘽",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"phone",
-      "limitParam":"",
-      "limitErrInfo":"涔欐柟鑱旂郴鐢佃瘽閿欒",
-      "show": false
-    },
-    {
-      "code": "operator",
-      "cnCode":"缁忓姙浜�",
-      "desc":"蹇呭~锛岃濉啓缁忓姙浜�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"maxLength",
-      "limitParam":"64",
-      "limitErrInfo":"缁忓姙浜鸿秴杩�64浣�",
-      "show": true
-    },
-    {
-      "code": "operatorLink",
-      "cnCode":"鑱旂郴鐢佃瘽",
-      "desc":"蹇呭~锛岃濉啓缁忓姙浜鸿仈绯荤數璇�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"phone",
-      "limitParam":"",
-      "limitErrInfo":"缁忓姙浜鸿仈绯荤數璇濇牸寮忛敊璇�",
-      "show": false
-    },
-    {
-      "code": "amount",
-      "cnCode":"鍚堝悓閲戦",
-      "desc":"蹇呭~锛岃濉啓鍚堝悓閲戦",
-      "required":false,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"money",
-      "limitParam":"",
-      "limitErrInfo":"鍚堝悓閲戦鏍煎紡閿欒锛屽1.50",
-      "show": true
-    },
-    {
-      "code": "startTime",
-      "cnCode":"寮�濮嬫椂闂�",
-      "desc":"蹇呭~锛岃濉啓鍚堝悓寮�濮嬫椂闂�",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"dateTime",
-      "limitParam":"",
-      "limitErrInfo":"鍚堝悓寮�濮嬫椂闂存牸寮忛敊璇�",
-      "show": true
-    },
-    {
-      "code": "endTime",
-      "cnCode":"缁撴潫鏃堕棿",
-      "desc":"蹇呭~锛岃濉啓鍚堝悓缁撴潫鏃堕棿",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"dateTime",
-      "limitParam":"",
-      "limitErrInfo":"鍚堝悓缁撴潫鏃堕棿鏍煎紡閿欒",
-      "show": true
-    },
-    {
-      "code": "signingTime",
-      "cnCode":"绛捐鏃堕棿",
-      "desc":"閫夊~锛岃濉啓鍚堝悓绛捐鏃堕棿",
-      "required":true,
-      "hasDefaultValue":false,
-      "inputType": "input",
-      "limit":"dateTime",
-      "limitParam":"",
-      "limitErrInfo":"鍚堝悓绛捐鏃堕棿鏍煎紡閿欒",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "澶囨敞鍐呭涓嶈兘瓒呰繃200",
       "show": false
     }
   ]

--
Gitblit v1.8.0