From a9193cfd5ae8d7fa7e0824b5f77e4deb72695dae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:29:00 +0800
Subject: [PATCH] 合并代码

---
 java110-code-generator/src/main/resources/web/template_1.json |  107 +++++++++++++++++++++++++----------------------------
 1 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/java110-code-generator/src/main/resources/web/template_1.json b/java110-code-generator/src/main/resources/web/template_1.json
index df35c3f..f9c92a0 100644
--- a/java110-code-generator/src/main/resources/web/template_1.json
+++ b/java110-code-generator/src/main/resources/web/template_1.json
@@ -1,79 +1,72 @@
 {
-  "templateName":"灏忓尯",
-  "templateCode":"community",
-  "templateKey":"communityId",
-  "templateKeyName":"灏忓尯ID",
+  "templateName":"灏忕▼搴忕鐞�",
+  "templateCode":"smallWeChat",
+  "templateKey":"weChatId",
+  "templateKeyName":"缂栫爜",
+  "searchCode": "name",
+  "searchName": "灏忕▼搴忓悕绉�",
+  "conditions": [
+    {
+      "name": "灏忕▼搴忓悕绉�",
+      "inputType": "input",
+      "code": "name",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "appId",
+      "inputType": "input",
+      "code": "appId",
+      "whereCondition": "equal"
+    }
+  ],
   "columns":[
     {
       "code":"name",
-      "cnCode":"灏忓尯鍚嶇О",
-      "desc":"蹇呭~锛岃濉啓灏忓尯鍚嶇О",
+      "cnCode":"灏忕▼搴忓悕绉�",
+      "desc":"蹇呭~锛岃濉啓灏忕▼搴忓悕绉�",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxin",
-      "limitParam":"10,20",
-      "limitErrInfo":"灏忓尯鍚嶇О蹇呴』鍦�10鑷�20瀛楃涔嬮棿"
+      "inputType": "input",
+      "limit":"max",
+      "limitParam":"1,100",
+      "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
+      "show": true
     },
     {
-      "code":"address",
-      "cnCode":"灏忓尯鍦板潃",
-      "desc":"蹇呭~锛岃濉啓灏忓尯鍦板潃",
+      "code": "appId",
+      "cnCode":"appId",
+      "desc":"蹇呭~锛岃濉啓appId",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"50",
-      "limitErrInfo":"灏忓尯鍦板潃涓嶈兘澶т簬50涓瓧绗�"
+      "limitParam":"1,100",
+      "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
+      "show": true
     },
     {
-      "code":"nearbyLandmarks",
-      "cnCode":"闄勮繎鍦版爣",
-      "desc":"蹇呭~锛岃濉啓灏忓尯闄勮繎鍦版爣",
+      "code":"appSecret",
+      "cnCode":"搴旂敤瀵嗛挜",
+      "desc":"蹇呭~锛岃濉啓搴旂敤瀵嗛挜",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"50",
-      "limitErrInfo":"灏忓尯闄勮繎鍦版爣涓嶈兘澶т簬50涓瓧绗�"
+      "limitParam":"1,200",
+      "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     },
     {
-      "code":"cityCode",
-      "cnCode":"鍩庡競缂栫爜",
-      "desc":"",
-      "required":false,
-      "hasDefaultValue":true,
-      "defaultValue":"0971",
-      "inputType":"none",
+      "code": "payPassword",
+      "cnCode":"鏀粯瀵嗙爜",
+      "desc":"蹇呭~锛岃濉啓鏀粯瀵嗙爜",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"12",
-      "limitErrInfo":"灏忓尯鍩庡競缂栫爜涓嶈兘澶т簬4涓瓧绗�"
-    },
-    {
-      "code":"mapX",
-      "cnCode":"灏忓尯缁村害",
-      "desc":"",
-      "required":false,
-      "hasDefaultValue":true,
-      "defaultValue":"101.33",
-      "inputType":"none",
-      "limit":"maxin",
-      "limitParam":"20",
-      "limitErrInfo":"灏忓尯鍩庡競缂栫爜涓嶈兘澶т簬4涓瓧绗�"
-    },
-    {
-      "code":"mapY",
-      "cnCode":"灏忓尯缁忓害",
-      "desc":"",
-      "required":false,
-      "hasDefaultValue":true,
-      "defaultValue":"101.33",
-      "inputType":"none",
-      "limit":"maxin",
-      "limitParam":"20",
-      "limitErrInfo":"灏忓尯鍩庡競缂栫爜涓嶈兘澶т簬4涓瓧绗�"
+      "limitParam":"1,200",
+      "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     }
-
-
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0