合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

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

@@ -1,38 +1,37 @@
{
  "autoMove": true,
  "id": "detailId",
  "name": "reportFeeYearCollectionDetail",
  "desc": "费用年收费明细",
  "shareParam": "communityId",
  "shareColumn": "community_id",
  "shareName": "report",
  "tableName": "report_fee_year_collection_detail",
  "id": "attrId",
  "name": "contractChangePlanDetailAttr",
  "desc": "合同变更属性",
  "shareParam": "storeId",
  "shareColumn": "store_id",
  "shareName": "store",
  "tableName": "contract_change_plan_detail_attr",
  "param": {
    "storeId": "store_id",
    "detailId": "detail_id",
    "collectionId": "collection_id",
    "collectionYear": "collection_year",
    "receivableAmount": "receivable_amount",
    "receivedAmount": "received_amount",
    "communityId": "community_id",
    "relationYear": "relation_year",
    "contractId": "contract_id",
    "attrId": "attr_id",
    "specCd": "spec_cd",
    "value": "value",
    "statusCd": "status_cd"
  },
  "required": [
    {
      "code": "communityId",
      "msg": "小区不能为空"
      "code": "contractId",
      "msg": "合同ID不能为空"
    },
    {
      "code": "collectionId",
      "msg": "年收费ID不能为空"
      "code": "detailId",
      "msg": "变更明细不能为空"
    },
    {
      "code": "receivedAmount",
      "msg": "实收金额不能为空"
      "code": "storeId",
      "msg": "商户ID不能为空"
    },
    {
      "code": "receivableAmount",
      "msg": "应收金额不能为空"
      "code": "specCd",
      "msg": "用户规格不能为空"
    }
  ]
}