Merge branch 'master' into wangfy-dev

wfy

2021-09-14 cd33651deff9fff7e7d9651b766210771c075190

 java110-generator/src/main/resources/newBack/template_1.json

old mode 100644
new mode 100755
@@ -1,49 +1,87 @@
{
  "autoMove": true,
  "id": "ruleId",
  "name": "activitiesRule",
  "desc": "活动规则",
  "shareParam": "objId",
  "shareColumn": "obj_id",
  "shareName": "user",
  "tableName": "activities_rule",
  "param": {
    "ruleId": "rule_id",
    "ruleName": "rule_name",
    "ruleType": "rule_type",
    "startTime": "start_time",
    "endTime": "end_time",
    "activitiesObj": "activities_obj",
    "section": "section",
    "remark": "remark",
    "objType": "obj_type",
    "objId": "obj_id",
    "statusCd": "status_cd"
    "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"
  },
  "name": "room",
  "shareColumn": "community_id",
  "id": "roomId",
  "shareName": "community",
  "autoMove": true,
  "required": [
    {
      "code": "ruleName",
      "msg": "规则名称不能为空"
      "msg": "房屋ID不能为空",
      "code": "roomId"
    },
    {
      "code": "ruleType",
      "msg": "规则类型不能为空"
      "msg": "房屋编号不能为空",
      "code": "roomNum"
    },
    {
      "code": "startTime",
      "msg": "开始时间不能为空"
      "msg": "单元ID不能为空",
      "code": "unitId"
    },
    {
      "code": "endTime",
      "msg": "结束时间不能为空"
      "msg": "层数不能为空",
      "code": "layer"
    },
    {
      "code": "activitiesObj",
      "msg": "活动对象不能为空"
      "msg": "户型不能为空",
      "code": "apartment"
    },
    {
      "code": "remark",
      "msg": "活动说明不能为空"
      "msg": "建筑面积不能为空",
      "code": "builtUpArea"
    },
    {
      "msg": "算费系数不能为空",
      "code": "feeCoefficient"
    },
    {
      "msg": "用户ID不能为空",
      "code": "userId"
    },
    {
      "msg": "数据状态，详细参考c_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"
}