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 | 92 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 45 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 b98de56..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,70 +1,72 @@
{
- "templateName":"鍋滆溅鍦�",
- "templateCode":"parkingArea",
- "templateKey":"paId",
- "templateKeyName":"鍋滆溅鍦篒D",
- "searchCode": "num",
- "searchName": "鍋滆溅鍦虹紪鍙�",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
+ "searchCode": "name",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "鍋滆溅鍦虹紪鍙�",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
- "code": "num",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "鍋滆溅鍦虹被鍨�",
- "inputType": "select",
- "selectValue":"1001,2001",
- "selectValueName":"鍦颁笂鍋滆溅鍦�,鍦颁笅鍋滆溅鍦�",
- "code": "typeCd",
- "whereCondition": "equal"
- },
- {
- "name": "鍋滆溅鍦篒D",
+ "name": "appId",
"inputType": "input",
- "code": "paId",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
- "code":"num",
- "cnCode":"鍋滆溅鍦虹紪鍙�",
- "desc":"蹇呭～锛岃濉啓鍋滆溅鍦虹紪鍙�",
+ "code":"name",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxin",
- "limitParam":"1,12",
- "limitErrInfo":"鍋滆溅鍦虹紪鍙蜂笉鑳借秴杩�12浣�",
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code": "typeCd",
- "cnCode":"鍋滆溅鍦虹被鍨�",
- "desc":"蹇呭～锛岃閫夋嫨鍋滆溅鍦虹被鍨�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"1001,2001",
- "selectValueName":"鍦颁笂鍋滆溅鍦�,鍦颁笅鍋滆溅鍦�",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鍋滆溅鍦虹被鍨嬫牸寮忛敊璇�",
- "show": true
- },
- {
- "code": "remark",
- "cnCode":"澶囨敞",
- "desc":"蹇呭～锛岃濉啓澶囨敞",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
"inputType": "input",
"limit":"maxin",
- "limitParam":"1,4000",
- "limitErrInfo":"澶囨敞澶暱",
- "show": false
+ "limitParam":"1,100",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
+ "show": true
+ },
+ {
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
+ "required":true,
+ "hasDefaultValue":false,
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
+ },
+ {
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
+ "required":true,
+ "hasDefaultValue":false,
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
+ "show": true
}
]
}
\ No newline at end of file
--
Gitblit v1.8.0