From c8195a8a1c34b9fa8db9aa4dc340d4344044ce97 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 29 六月 2021 20:52:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/resources/web/template_1.json |  104 ++++++++++++++++++++-------------------------------
 1 files changed, 41 insertions(+), 63 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 686e84b..db351f0
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,82 +1,60 @@
 {
-  "templateName": "鏈�缇庡憳宸�",
-  "directories": "property",
-  "templateCode": "activitiesBeautifulStaff",
-  "templateKey": "beId",
-  "templateKeyName": "ID",
-  "searchCode": "beId",
-  "searchName": "ID",
+  "templateName":"淇濊瘉閲戝璞�",
+  "templateCode":"accountBondObj",
+  "templateKey":"bobjId",
+  "templateKeyName":"淇濊瘉閲戝璞D",
+  "searchCode": "bobjId",
+  "searchName": "淇濊瘉閲戝璞D",
+  "directories": "acct",
   "conditions": [
-    {
-      "name": "娲诲姩瑙勫垯",
-      "inputType": "select",
-      "selectValue": "6666",
-      "selectValueName": "鏈�缇庡憳宸�",
-      "code": "ruleId",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "鍛樺伐鍚嶇О",
-      "inputType": "input",
-      "code": "staffName",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "鍛樺伐缂栧彿",
-      "inputType": "input",
-      "code": "activitiesNum",
-      "whereCondition": "equal"
-    }
   ],
-  "columns": [
+  "columns":[
     {
-      "code": "ruleId",
-      "cnCode": "娲诲姩瑙勫垯",
-      "desc": "蹇呭~锛岃閫夋嫨娲诲姩瑙勫垯",
-      "required": true,
-      "hasDefaultValue": false,
-      "inputType": "select",
-      "selectValue": "6666",
-      "selectValueName": "鏈�缇庡憳宸�",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "娲诲姩瑙勫垯鏍煎紡閿欒",
+      "code":"bondId",
+      "cnCode":"淇濊瘉閲�",
+      "desc":"蹇呭~锛岃濉啓淇濊瘉閲�",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType":"input",
+      "limit":"maxin",
+      "limitParam":"1,20",
+      "limitErrInfo":"淇濊瘉閲戝悕绉拌秴闀夸簡",
       "show": true
     },
     {
-      "code": "staffId",
-      "cnCode": "鍛樺伐",
-      "desc": "蹇呭~锛岃濉啓鍛樺伐",
-      "required": true,
-      "hasDefaultValue": false,
+      "code": "objId",
+      "cnCode":"淇濊瘉閲戝璞D",
+      "desc":"蹇呭~锛岃濉啓淇濊瘉閲戝璞D",
+      "required":true,
+      "hasDefaultValue":false,
       "inputType": "input",
-      "limit": "maxLength",
-      "limitParam": "128",
-      "limitErrInfo": "鍛樺伐鍚嶇О澶暱",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"淇濊瘉閲戦噾棰濇牸寮忔湁璇�",
       "show": true
     },
     {
-      "code": "activitiesNum",
-      "cnCode": "鍛樺伐缂栧彿",
-      "desc": "蹇呭~锛岃濉啓鍛樺伐缂栧彿",
-      "required": true,
-      "hasDefaultValue": false,
+      "code": "receivableAmount",
+      "cnCode":"搴旀敹閲戦",
+      "desc":"蹇呭~锛岃濉啓搴旀敹閲戦",
+      "required":false,
+      "hasDefaultValue":false,
       "inputType": "input",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "缂栧彿蹇呴』涓烘暟瀛�",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"涓嶆槸鏈夋晥鏁板瓧鏍煎紡",
       "show": true
     },
     {
-      "code": "workContent",
-      "cnCode": "宸ヤ綔绠�浠�",
-      "desc": "蹇呭~锛岃濉啓宸ヤ綔绠�浠�",
-      "required": true,
-      "hasDefaultValue": false,
+      "code": "receivedAmount",
+      "cnCode":"瀹炴敹閲戦",
+      "desc":"蹇呭~锛岃濉啓瀹炴敹閲戦",
+      "required":false,
+      "hasDefaultValue":false,
       "inputType": "input",
-      "limit": "maxLength",
-      "limitParam": "1024",
-      "limitErrInfo": "宸ヤ綔绠�浠嬭鏄庡お闀�",
+      "limit":"num",
+      "limitParam":"",
+      "limitErrInfo":"涓嶆槸鏈夋晥鏁板瓧鏍煎紡",
       "show": true
     }
   ]

--
Gitblit v1.8.0