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 |   94 +++++++++++++++++++++++++++-------------------
 1 files changed, 55 insertions(+), 39 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 149e445..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,56 +1,72 @@
 {
-  "templateName":"鍏憡",
-  "templateCode":"notice",
-  "templateKey":"noticeId",
-  "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":"title",
-      "cnCode":"鏍囬",
-      "desc":"蹇呭~锛岃濉啓鏍囬",
+      "code":"name",
+      "cnCode":"灏忕▼搴忓悕绉�",
+      "desc":"蹇呭~锛岃濉啓灏忕▼搴忓悕绉�",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType": "input",
+      "limit":"max",
+      "limitParam":"1,100",
+      "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
+      "show": true
+    },
+    {
+      "code": "appId",
+      "cnCode":"appId",
+      "desc":"蹇呭~锛岃濉啓appId",
+      "required":true,
+      "hasDefaultValue":false,
+      "inputType": "input",
       "limit":"maxin",
-      "limitParam":"4,100",
-      "limitErrInfo":"灏忓尯鍚嶇О蹇呴』鍦�4鑷�100瀛楃涔嬮棿"
+      "limitParam":"1,100",
+      "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
+      "show": true
     },
     {
-      "code":"noticeTypeCd",
-      "cnCode":"鍏憡绫诲瀷",
-      "desc":"蹇呭~锛岃閫夋嫨鍏憡绫诲瀷",
+      "code":"appSecret",
+      "cnCode":"搴旂敤瀵嗛挜",
+      "desc":"蹇呭~锛岃濉啓搴旂敤瀵嗛挜",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"select",
-      "selectValue":"1000,1001,1002",
-      "selectValueName":"涓氫富閫氱煡,鍛樺伐閫氱煡,灏忓尯閫氱煡",
-      "limit":"maxLength",
-      "limitParam":"200",
-      "limitErrInfo":"鍏憡绫诲瀷閿欒"
+      "inputType": "input",
+      "limit":"maxin",
+      "limitParam":"1,200",
+      "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     },
     {
-      "code":"context",
-      "cnCode":"鍏憡鍐呭",
-      "desc":"蹇呭~锛岃濉啓鍏憡鍐呭",
+      "code": "payPassword",
+      "cnCode":"鏀粯瀵嗙爜",
+      "desc":"蹇呭~锛岃濉啓鏀粯瀵嗙爜",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
-      "limit":"maxLength",
-      "limitParam":"500",
-      "limitErrInfo":"鍏憡鍐呭涓嶈兘瓒呰繃500涓瓧"
-    },
-    {
-      "code":"startTime",
-      "cnCode":"寮�濮嬫椂闂�",
-      "desc":"蹇呴�夛紝璇峰~鍐欏紑濮嬫椂闂� 2019-01-02",
-      "required":true,
-      "hasDefaultValue":false,
-      "defaultValue":"",
-      "inputType":"input",
-      "limit":"date",
-      "limitParam":"",
-      "limitErrInfo":"寮�濮嬫椂闂翠笉鏄湁鏁堢殑鏃ュ織"
+      "inputType": "input",
+      "limit":"maxin",
+      "limitParam":"1,200",
+      "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+      "show": true
     }
-
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0