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 | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 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 3642810..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,72 +1,72 @@
{
- "templateName":"缂栫爜鏄犲皠",
- "templateCode":"mapping",
- "templateKey":"id",
- "templateKeyName":"缂栫爜ID",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
"searchCode": "name",
- "searchName": "鍚嶇О",
+ "searchName": "灏忕▼搴忓悕绉�",
+ "conditions": [
+ {
+ "name": "灏忕▼搴忓悕绉�",
+ "inputType": "input",
+ "code": "name",
+ "whereCondition": "equal"
+ },
+ {
+ "name": "appId",
+ "inputType": "input",
+ "code": "appId",
+ "whereCondition": "equal"
+ }
+ ],
"columns":[
{
- "code":"domain",
- "cnCode":"鍩�",
- "desc":"蹇呭～锛岃濉啓鍩�",
- "required":true,
- "hasDefaultValue":true,
- "defaultValue":"DOMAIN.COMMON",
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"50",
- "limitErrInfo":"鍩熼暱搴︿笉鑳借秴杩�50"
- },
- {
"code":"name",
- "cnCode":"鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鍚嶇О",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxin",
- "limitParam":"2,50",
- "limitErrInfo":"鍚嶇О蹇呴』鍦�2鑷�50瀛楃涔嬮棿"
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
+ "show": true
},
{
- "code":"key",
- "cnCode":"閿�",
- "desc":"蹇呭～锛岃濉啓閿�",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"input",
+ "inputType": "input",
"limit":"maxin",
"limitParam":"1,100",
- "limitErrInfo":"閿繀椤诲湪1鑷�100涔嬮棿"
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
+ "show": true
},
-
{
- "code":"value",
- "cnCode":"鍊�",
- "desc":"蹇呭～锛岃濉啓鍊�",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
"hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"input",
+ "inputType": "input",
"limit":"maxin",
- "limitParam":"1,100",
- "limitErrInfo":"鍊煎繀椤诲湪1鑷�100涔嬮棿"
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
},
-
{
- "code":"remark",
- "cnCode":"澶囨敞",
- "desc":"鍙～锛岃濉啓澶囨敞",
- "required":false,
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
+ "required":true,
"hasDefaultValue":false,
- "defaultValue":"",
- "inputType":"textarea",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"澶囨敞鍐呭涓嶈兘瓒呰繃200"
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
}
-
]
}
\ No newline at end of file
--
Gitblit v1.8.0