Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

@@ -1,39 +1,51 @@
{
  "autoMove": true,
  "id": "detailId",
  "name": "reportFeeYearCollectionDetail",
  "desc": "费用年收费明细",
  "shareParam": "communityId",
  "shareColumn": "community_id",
  "shareName": "report",
  "tableName": "report_fee_year_collection_detail",
  "param": {
    "detailId": "detail_id",
    "collectionId": "collection_id",
    "collectionYear": "collection_year",
    "receivableAmount": "receivable_amount",
    "receivedAmount": "received_amount",
    "skipLevel": "skip_level",
    "describle": "describle",
    "statusCd": "status_cd",
    "communityId": "community_id",
    "relationYear": "relation_year",
    "statusCd": "status_cd"
    "storeId": "store_id",
    "flowId": "flow_id",
    "flowName": "flow_name",
    "flowType": "flow_type",
    "processDefinitionKey": "process_definition_key"
  },
  "name": "workflow",
  "shareColumn": "community_id",
  "id": "flowId",
  "shareName": "common",
  "autoMove": true,
  "required": [
    {
      "code": "communityId",
      "msg": "小区不能为空"
      "msg": "流程ID不能为空",
      "code": "flowId"
    },
    {
      "code": "collectionId",
      "msg": "年收费ID不能为空"
      "msg": "流程名称不能为空",
      "code": "flowName"
    },
    {
      "code": "receivedAmount",
      "msg": "实收金额不能为空"
      "msg": "跳过不能为空",
      "code": "skipLevel"
    },
    {
      "code": "receivableAmount",
      "msg": "应收金额不能为空"
      "msg": "小区ID不能为空",
      "code": "communityId"
    },
    {
      "msg": "商户ID,用来做分区不能为空",
      "code": "storeId"
    },
    {
      "msg": "数据状态不能为空",
      "code": "statusCd"
    },
    {
      "msg": "流程类型不能为空",
      "code": "flowType"
    }
  ]
  ],
  "desc": "工作流程",
  "shareParam": "communityId",
  "tableName": "workflow"
}