Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

shane

2021-08-20 ab6a423cf604b83f06b5768dbc162ece744a32d9

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

@@ -1,74 +1,29 @@
{
  "autoMove": true,
<<<<<<< HEAD
  "id": "anValueId",
  "name": "reportInfoAnswerValue",
  "desc": "批量操作日志详情",
  "shareParam": "communityId",
  "shareColumn": "community_id",
  "shareName": "report",
  "tableName": "report_info_answer_value",
  "id": "xmlId",
  "name": "oaWorkflowXml",
  "desc": "OA流程图",
  "shareParam": "storeId",
  "shareColumn": "store_id",
  "shareName": "oa",
  "tableName": "oa_workflow_xml",
  "param": {
    "anValueId": "an_value_id",
    "userAnId": "user_an_id",
    "settingId": "setting_id",
    "titleId": "title_id",
    "valueId": "value_id",
    "valueContent": "value_content",
    "communityId": "community_id",
    "createTime": "create_time",
=======
  "id": "backId",
  "name": "reportInfoBackCity",
  "desc": "返省上报",
  "shareParam": "communityId",
  "shareColumn": "community_id",
  "shareName": "report",
  "tableName": "report_info_back_city",
  "param": {
    "backId": "back_id",
    "name": "name",
    "communityId": "community_id",
    "idCard": "id_card",
    "tel": "tel",
    "source": "source",
    "sourceCity": "source_city",
    "sourceCityName": "source_city_name",
    "backTime": "back_time",
    "userId": "user_id",
    "remark": "remark",
>>>>>>> 7e621d56f2efc96f42a47ba3e5a62af69c6dd043
    "xmlId": "xml_id",
    "flowId": "flow_id",
    "storeId": "store_id",
    "bpmnXml": "bpmn_xml",
    "svgXml": "svg_xml",
    "statusCd": "status_cd"
  },
  "required": [
    {
      "code": "anValueId",
      "msg": "小区不能为空"
      "code": "flowId",
      "msg": "流程不能为空"
    },
    {
      "code": "userAnId",
      "msg": "小区不能为空"
    },
    {
      "code": "settingId",
      "msg": "小区不能为空"
    },
    {
      "code": "titleId",
      "msg": "小区不能为空"
    },
    {
      "code": "valueId",
      "msg": "小区不能为空"
    },
    {
      "code": "valueContent",
      "msg": "小区不能为空"
    },
    {
      "code": "communityId",
      "msg": "小区不能为空"
      "code": "bpmnXml",
      "msg": "流程图不能为空"
    }

  ]
}
}