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 | 142 ++++++++++++----------------------------------
1 files changed, 38 insertions(+), 104 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 44afa71..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,138 +1,72 @@
{
- "templateName":"璁惧",
- "templateCode":"machine",
- "templateKey":"machineId",
- "templateKeyName":"璁惧ID",
- "searchCode": "machineName",
- "searchName": "璁惧鍚嶇О",
+ "templateName":"灏忕▼搴忕鐞�",
+ "templateCode":"smallWeChat",
+ "templateKey":"weChatId",
+ "templateKeyName":"缂栫爜",
+ "searchCode": "name",
+ "searchName": "灏忕▼搴忓悕绉�",
"conditions": [
{
- "name": "鎶曡瘔ID",
+ "name": "灏忕▼搴忓悕绉�",
"inputType": "input",
- "code": "complaintId",
+ "code": "name",
"whereCondition": "equal"
},
{
- "name": "鎶曡瘔绫诲瀷",
- "inputType": "select",
- "code": "typeCd",
- "selectValue":"809001,809002",
- "selectValueName":"鎶曡瘔,寤鸿",
- "whereCondition": "equal"
- },
- {
- "name": "鎶曡瘔浜�",
+ "name": "appId",
"inputType": "input",
- "code": "complaintName",
- "whereCondition": "equal"
- },
- {
- "name": "鑱旂郴鐢佃瘽",
- "inputType": "input",
- "code": "tel",
- "whereCondition": "equal"
- },
- {
- "name": "鎴垮眿缂栧彿",
- "inputType": "input",
- "code": "roomId",
- "whereCondition": "equal"
- },
- {
- "name": "鎶曡瘔鐘舵��",
- "inputType": "select",
- "code": "state",
- "selectValue":"1100,1200",
- "selectValueName":"娲惧崟,缁撳崟",
+ "code": "appId",
"whereCondition": "equal"
}
],
"columns":[
{
- "code":"storeId",
- "cnCode":"鍟嗘埛ID",
- "desc":"蹇呭～锛岃濉啓鍟嗘埛ID",
+ "code":"name",
+ "cnCode":"灏忕▼搴忓悕绉�",
+ "desc":"蹇呭～锛岃濉啓灏忕▼搴忓悕绉�",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鍟嗘埛ID蹇呴』涓烘暟瀛�",
- "show": false
- },
- {
- "code": "typeCd",
- "cnCode":"鎶曡瘔绫诲瀷",
- "desc":"蹇呭～锛岃閫夋嫨鎶曡瘔绫诲瀷",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"809001,809002",
- "selectValueName":"鎶曡瘔,寤鸿",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鎶曡瘔绫诲瀷鏍煎紡閿欒",
+ "inputType": "input",
+ "limit":"max",
+ "limitParam":"1,100",
+ "limitErrInfo":"灏忕▼搴忓悕绉颁笉鑳借秴杩�100浣�",
"show": true
},
{
- "code":"roomId",
- "cnCode":"鎴垮眿缂栧彿",
- "desc":"蹇呭～锛岃閫夋嫨鎴垮眿缂栧彿",
+ "code": "appId",
+ "cnCode":"appId",
+ "desc":"蹇呭～锛岃濉啓appId",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鎴垮眿缂栧彿鏍煎紡閿欒",
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,100",
+ "limitErrInfo":"appId涓嶈兘瓒呰繃100浣�",
"show": true
},
{
- "code":"complaintName",
- "cnCode":"鎶曡瘔浜�",
- "desc":"蹇呭～锛岃濉啓鎶曡瘔浜�",
+ "code":"appSecret",
+ "cnCode":"搴旂敤瀵嗛挜",
+ "desc":"蹇呭～锛岃濉啓搴旂敤瀵嗛挜",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鎶曡瘔浜轰笉鑳藉ぇ浜�200浣�",
- "show": false
- },
- {
- "code":"tel",
- "cnCode":"鎶曡瘔鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓鎶曡瘔鐢佃瘽",
- "required":true,
- "hasDefaultValue":false,
- "inputType":"input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"鎶曡瘔鐢佃瘽鏍煎紡閿欒",
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"搴旂敤瀵嗛挜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
},
{
- "code":"state",
- "cnCode":"鎶曡瘔鐘舵��",
- "desc":"蹇呭～锛岃濉啓鎶曡瘔鐘舵��",
+ "code": "payPassword",
+ "cnCode":"鏀粯瀵嗙爜",
+ "desc":"蹇呭～锛岃濉啓鏀粯瀵嗙爜",
"required":true,
"hasDefaultValue":false,
- "inputType":"input",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鎶曡瘔鐘舵�佹牸寮忛敊璇�",
+ "inputType": "input",
+ "limit":"maxin",
+ "limitParam":"1,200",
+ "limitErrInfo":"鏀粯瀵嗙爜涓嶈兘瓒呰繃200涓瓧绗�",
"show": true
- },
- {
- "code":"context",
- "cnCode":"鎶曡瘔鍐呭",
- "desc":"蹇呭～锛岃濉啓鎶曡瘔鍐呭",
- "required":true,
- "hasDefaultValue":false,
- "inputType":"textarea",
- "limit":"maxLength",
- "limitParam":"4000",
- "limitErrInfo":"鎶曡瘔鐘舵�佽秴杩�4000浣�",
- "show": false
}
]
}
\ No newline at end of file
--
Gitblit v1.8.0