From cd33651deff9fff7e7d9651b766210771c075190 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期二, 14 九月 2021 17:26:16 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev

---
 java110-generator/src/main/resources/newBack/template_1.json |  103 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/java110-generator/src/main/resources/newBack/template_1.json b/java110-generator/src/main/resources/newBack/template_1.json
index 5f60756..96cf449 100755
--- a/java110-generator/src/main/resources/newBack/template_1.json
+++ b/java110-generator/src/main/resources/newBack/template_1.json
@@ -1,40 +1,87 @@
 {
-  "autoMove": true,
-  "id": "userId",
-  "name": "user",
-  "desc": "鐢ㄦ埛",
-  "shareParam": "userId",
-  "shareColumn": "user_id",
-  "shareName": "user",
-  "tableName": "u_user",
   "param": {
+    "section": "section",
+    "remark": "remark",
+    "statusCd": "status_cd",
+    "roomSubType": "room_sub_type",
+    "roomArea": "room_area",
     "userId": "user_id",
-    "name": "name",
-    "email": "email",
-    "address": "address",
-    "password": "password",
-    "locationCd": "location_cd",
-    "age": "age",
-    "sex": "sex",
-    "tel": "tel",
-    "levelCd": "level_cd",
-    "bId": "b_id",
-    "score": "score",
-    "statusCd": "status_cd"
+    "roomId": "room_id",
+    "layer": "layer",
+    "feeCoefficient": "fee_coefficient",
+    "builtUpArea": "built_up_area",
+    "roomNum": "room_num",
+    "unitId": "unit_id",
+    "state": "state",
+    "communityId": "community_id",
+    "apartment": "apartment",
+    "roomType": "room_type",
+    "roomRent": "room_rent"
   },
+  "name": "room",
+  "shareColumn": "community_id",
+  "id": "roomId",
+  "shareName": "community",
+  "autoMove": true,
   "required": [
     {
-      "code": "name",
-      "msg": "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖"
+      "msg": "鎴垮眿ID涓嶈兘涓虹┖",
+      "code": "roomId"
     },
     {
-      "code": "password",
-      "msg": "瀵嗙爜涓嶈兘涓虹┖"
+      "msg": "鎴垮眿缂栧彿涓嶈兘涓虹┖",
+      "code": "roomNum"
     },
     {
-      "code": "tel",
-      "msg": "鎵嬫満鍙蜂笉鑳戒负绌�"
+      "msg": "鍗曞厓ID涓嶈兘涓虹┖",
+      "code": "unitId"
+    },
+    {
+      "msg": "灞傛暟涓嶈兘涓虹┖",
+      "code": "layer"
+    },
+    {
+      "msg": "鎴峰瀷涓嶈兘涓虹┖",
+      "code": "apartment"
+    },
+    {
+      "msg": "寤虹瓚闈㈢Н涓嶈兘涓虹┖",
+      "code": "builtUpArea"
+    },
+    {
+      "msg": "绠楄垂绯绘暟涓嶈兘涓虹┖",
+      "code": "feeCoefficient"
+    },
+    {
+      "msg": "鐢ㄦ埛ID涓嶈兘涓虹┖",
+      "code": "userId"
+    },
+    {
+      "msg": "鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥涓嶈兘涓虹┖",
+      "code": "statusCd"
+    },
+    {
+      "msg": "鎴垮眿鐘舵�侊紝濡傛埧灞嬪嚭鍞瓑锛岃鏌ョ湅state 琛ㄤ笉鑳戒负绌�",
+      "code": "state"
+    },
+    {
+      "msg": "鎴垮眿绫诲瀷涓嶈兘涓虹┖",
+      "code": "roomType"
+    },
+    {
+      "msg": "鎴垮眿绫诲瀷 110 浣忓畢鎴垮眿锛�119 鍔炲叕瀹� 120 瀹胯垗涓嶈兘涓虹┖",
+      "code": "roomSubType"
+    },
+    {
+      "msg": "瀹ゅ唴闈㈢Н涓嶈兘涓虹┖",
+      "code": "roomArea"
+    },
+    {
+      "msg": "绉熼噾涓嶈兘涓虹┖",
+      "code": "roomRent"
     }
-  ]
+  ],
+  "desc": "鎴垮眿",
+  "shareParam": "communityId",
+  "tableName": "building_room"
 }
-

--
Gitblit v1.8.0