From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-generator/src/main/resources/newBack/template_1.json | 86 ++++++++++++------------------------------
1 files changed, 25 insertions(+), 61 deletions(-)
diff --git a/java110-generator/src/main/resources/newBack/template_1.json b/java110-generator/src/main/resources/newBack/template_1.json
index 96cf449..8678ea1 100755
--- a/java110-generator/src/main/resources/newBack/template_1.json
+++ b/java110-generator/src/main/resources/newBack/template_1.json
@@ -1,87 +1,51 @@
{
"param": {
- "section": "section",
- "remark": "remark",
+ "skipLevel": "skip_level",
+ "describle": "describle",
"statusCd": "status_cd",
- "roomSubType": "room_sub_type",
- "roomArea": "room_area",
- "userId": "user_id",
- "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"
+ "storeId": "store_id",
+ "flowId": "flow_id",
+ "flowName": "flow_name",
+ "flowType": "flow_type",
+ "processDefinitionKey": "process_definition_key"
},
- "name": "room",
+ "name": "workflow",
"shareColumn": "community_id",
- "id": "roomId",
- "shareName": "community",
+ "id": "flowId",
+ "shareName": "common",
"autoMove": true,
"required": [
{
- "msg": "鎴垮眿ID涓嶈兘涓虹┖",
- "code": "roomId"
+ "msg": "娴佺▼ID涓嶈兘涓虹┖",
+ "code": "flowId"
},
{
- "msg": "鎴垮眿缂栧彿涓嶈兘涓虹┖",
- "code": "roomNum"
+ "msg": "娴佺▼鍚嶇О涓嶈兘涓虹┖",
+ "code": "flowName"
},
{
- "msg": "鍗曞厓ID涓嶈兘涓虹┖",
- "code": "unitId"
+ "msg": "璺宠繃涓嶈兘涓虹┖",
+ "code": "skipLevel"
},
{
- "msg": "灞傛暟涓嶈兘涓虹┖",
- "code": "layer"
+ "msg": "灏忓尯ID涓嶈兘涓虹┖",
+ "code": "communityId"
},
{
- "msg": "鎴峰瀷涓嶈兘涓虹┖",
- "code": "apartment"
+ "msg": "鍟嗘埛ID,鐢ㄦ潵鍋氬垎鍖轰笉鑳戒负绌�",
+ "code": "storeId"
},
{
- "msg": "寤虹瓚闈㈢Н涓嶈兘涓虹┖",
- "code": "builtUpArea"
- },
- {
- "msg": "绠楄垂绯绘暟涓嶈兘涓虹┖",
- "code": "feeCoefficient"
- },
- {
- "msg": "鐢ㄦ埛ID涓嶈兘涓虹┖",
- "code": "userId"
- },
- {
- "msg": "鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥涓嶈兘涓虹┖",
+ "msg": "鏁版嵁鐘舵�佷笉鑳戒负绌�",
"code": "statusCd"
},
{
- "msg": "鎴垮眿鐘舵�侊紝濡傛埧灞嬪嚭鍞瓑锛岃鏌ョ湅state 琛ㄤ笉鑳戒负绌�",
- "code": "state"
- },
- {
- "msg": "鎴垮眿绫诲瀷涓嶈兘涓虹┖",
- "code": "roomType"
- },
- {
- "msg": "鎴垮眿绫诲瀷 110 浣忓畢鎴垮眿锛�119 鍔炲叕瀹� 120 瀹胯垗涓嶈兘涓虹┖",
- "code": "roomSubType"
- },
- {
- "msg": "瀹ゅ唴闈㈢Н涓嶈兘涓虹┖",
- "code": "roomArea"
- },
- {
- "msg": "绉熼噾涓嶈兘涓虹┖",
- "code": "roomRent"
+ "msg": "娴佺▼绫诲瀷涓嶈兘涓虹┖",
+ "code": "flowType"
}
],
- "desc": "鎴垮眿",
+ "desc": "宸ヤ綔娴佺▼",
"shareParam": "communityId",
- "tableName": "building_room"
+ "tableName": "workflow"
}
--
Gitblit v1.8.0