Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

old mode 100644
new mode 100755
@@ -1,33 +1,51 @@
{
  "autoMove": true,
  "id": "partyaId",
  "name": "contractPartya",
  "desc": "合同房屋",
  "shareParam": "storeId",
  "shareColumn": "store_id",
  "shareName": "store",
  "tableName": "contract_partya",
  "param": {
    "partyaId": "partya_id",
    "partyA": "party_a",
    "aContacts": "a_contacts",
    "aLink": "a_link",
    "skipLevel": "skip_level",
    "describle": "describle",
    "statusCd": "status_cd",
    "communityId": "community_id",
    "storeId": "store_id",
    "statusCd": "status_cd"
    "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": "partyA",
      "msg": "甲方不能为空"
      "msg": "流程ID不能为空",
      "code": "flowId"
    },
    {
      "code": "aContacts",
      "msg": "联系人不能为空"
      "msg": "流程名称不能为空",
      "code": "flowName"
    },
    {
      "code": "aLink",
      "msg": "联系电话不能为空"
      "msg": "跳过不能为空",
      "code": "skipLevel"
    },
    {
      "msg": "小区ID不能为空",
      "code": "communityId"
    },
    {
      "msg": "商户ID,用来做分区不能为空",
      "code": "storeId"
    },
    {
      "msg": "数据状态不能为空",
      "code": "statusCd"
    },
    {
      "msg": "流程类型不能为空",
      "code": "flowType"
    }
  ]
  ],
  "desc": "工作流程",
  "shareParam": "communityId",
  "tableName": "workflow"
}