From 59d4ac771099844721d4fe0b2ff6f3ac28162099 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 24 十一月 2021 18:51:28 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-generator/src/main/resources/web/template_1.json |  198 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 129 insertions(+), 69 deletions(-)

diff --git a/java110-generator/src/main/resources/web/template_1.json b/java110-generator/src/main/resources/web/template_1.json
old mode 100644
new mode 100755
index f891dd1..dbfd428
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,91 +1,151 @@
 {
-  "templateName": "鎷煎洟璁剧疆",
-  "directories": "goods",
-  "templateCode": "groupBuySetting",
-  "templateKey": "settingId",
-  "templateKeyName": "璁剧疆ID",
-  "searchCode": "settingId",
-  "searchName": "璁剧疆ID",
-  "conditions": [
-    {
-      "name": "鎷煎洟鍚嶇О",
-      "inputType": "input",
-      "code": "groupBuyName",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "鎷煎洟鏃舵晥",
-      "inputType": "input",
-      "code": "validHours",
-      "whereCondition": "equal"
-    },
-    {
-      "name": "璁剧疆ID",
-      "inputType": "input",
-      "code": "settingId",
-      "whereCondition": "equal"
-    }
-  ],
+  "templateKeyName": "鍟嗗璐拱璁板綍琛↖D",
+  "templateName": "鍟嗗璐拱璁板綍琛�",
   "columns": [
     {
-      "code": "groupBuyName",
-      "cnCode": "鎷煎洟鍚嶇О",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟鍚嶇О",
-      "required": true,
       "hasDefaultValue": false,
-      "inputType": "input",
+      "limitParam": "30",
+      "code": "detailId",
+      "limitErrInfo": "璁板綍ID涓嶈兘瓒呰繃30",
+      "cnCode": "璁板綍ID",
       "limit": "maxLength",
-      "limitParam": "256",
-      "limitErrInfo": "鎷煎洟鍚嶇О涓嶈兘瓒呰繃256浣�",
-      "show": true
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛岃褰旾D"
     },
     {
-      "code": "groupBuyDesc",
-      "cnCode": "鎷煎洟绠�浠�",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟绠�浠�",
-      "required": true,
       "hasDefaultValue": false,
-      "inputType": "input",
+      "limitParam": "30",
+      "code": "poolId",
+      "limitErrInfo": "浼樻儬鍒镐笉鑳借秴杩�30",
+      "cnCode": "浼樻儬鍒�",
       "limit": "maxLength",
-      "limitParam": "500",
-      "limitErrInfo": "鎷煎洟绠�浠嬩笉鑳借秴杩�500浣�",
-      "show": true
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛屼紭鎯犲埜"
     },
     {
-      "code": "validHours",
-      "cnCode": "鎷煎洟鏃舵晥",
-      "desc": "蹇呭~锛岃濉啓鎷煎洟鏃舵晥",
-      "required": true,
       "hasDefaultValue": false,
+      "limitParam": "30",
+      "code": "shopId",
+      "limitErrInfo": "搴楅摵ID涓嶈兘瓒呰繃30",
+      "cnCode": "搴楅摵ID",
+      "limit": "maxLength",
+      "show": true,
       "inputType": "input",
-      "limit": "num",
-      "limitParam": "",
-      "limitErrInfo": "鎷煎洟鏃舵晥涓嶆槸鏈夋晥鏁板瓧",
-      "show": true
+      "required": true,
+      "desc": "蹇呭~锛屽簵閾篒D"
     },
     {
-      "code": "startTime",
-      "cnCode": "寮�濮嬫椂闂�",
-      "desc": "蹇呭~锛岃濉啓寮�濮嬫椂闂�",
-      "required": true,
       "hasDefaultValue": false,
+      "limitParam": "64",
+      "code": "couponName",
+      "limitErrInfo": "浼樻儬鍒稿悕绉颁笉鑳借秴杩�64",
+      "cnCode": "浼樻儬鍒稿悕绉�",
+      "limit": "maxLength",
+      "show": true,
       "inputType": "input",
-      "limit": "datetime",
-      "limitParam": "",
-      "limitErrInfo": "寮�濮嬫椂闂翠笉鏄湁鏁堟棩鏈�",
-      "show": true
+      "required": true,
+      "desc": "蹇呭~锛屼紭鎯犲埜鍚嶇О"
     },
     {
-      "code": "endTime",
-      "cnCode": "缁撴潫鏃堕棿",
-      "desc": "蹇呭~锛岃濉啓缁撴潫鏃堕棿",
-      "required": true,
       "hasDefaultValue": false,
+      "limitParam": "10",
+      "code": "actualPrice",
+      "limitErrInfo": "闈㈠�间笉鑳借秴杩�10",
+      "cnCode": "闈㈠��",
+      "limit": "maxLength",
+      "show": true,
       "inputType": "input",
-      "limit": "datetime",
-      "limitParam": "",
-      "limitErrInfo": "缁撴潫鏃堕棿涓嶆槸鏈夋晥鏃ユ湡",
-      "show": true
+      "required": true,
+      "desc": "蹇呭~锛岄潰鍊�"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "10",
+      "code": "buyPrice",
+      "limitErrInfo": "璐拱浠锋牸涓嶈兘瓒呰繃10",
+      "cnCode": "璐拱浠锋牸",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛岃喘涔颁环鏍�"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "10",
+      "code": "amount",
+      "limitErrInfo": "浠樻閲戦涓嶈兘瓒呰繃10",
+      "cnCode": "浠樻閲戦",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛屼粯娆鹃噾棰�"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "20",
+      "code": "buyCount",
+      "limitErrInfo": "璐拱鏁伴噺涓嶈兘瓒呰繃20",
+      "cnCode": "璐拱鏁伴噺",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛岃喘涔版暟閲�"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "20",
+      "code": "validityDay",
+      "limitErrInfo": "鏈夋晥鏈熶笉鑳借秴杩�20",
+      "cnCode": "鏈夋晥鏈�",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "蹇呭~锛屾湁鏁堟湡"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "`detail_id`",
+      "code": "primary",
+      "limitErrInfo": "primary涓嶈兘瓒呰繃`detail_id`",
+      "cnCode": "primary",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": true,
+      "desc": "primary"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "searchName": "鍟嗗璐拱璁板綍琛↖D",
+  "directories": "admin",
+  "searchCode": "detailId",
+  "templateCode": "couponDetail",
+  "conditions": [
+    {
+      "whereCondition": "equal",
+      "code": "poolId",
+      "name": "浼樻儬鍒�",
+      "inputType": "input"
+    },
+    {
+      "whereCondition": "equal",
+      "code": "shopId",
+      "name": "搴楅摵ID",
+      "inputType": "input"
+    },
+    {
+      "whereCondition": "equal",
+      "code": "validityDay",
+      "name": "鏈夋晥鏈�",
+      "inputType": "input"
+    }
+  ],
+  "templateKey": "detailId"
+}

--
Gitblit v1.8.0