Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

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

old mode 100644
new mode 100755
@@ -1,91 +1,68 @@
{
  "templateName": "拼团设置",
  "directories": "goods",
  "templateCode": "groupBuySetting",
  "templateKey": "settingId",
  "templateKeyName": "设置ID",
  "searchCode": "settingId",
  "searchName": "设置ID",
  "templateName":"收据模板",
  "directories": "property",
  "templateCode":"feePrintPage",
  "templateKey":"pageId",
  "templateKeyName":"收据ID",
  "searchCode": "pageId",
  "searchName": "收据ID",
  "conditions": [
    {
      "name": "拼团名称",
      "inputType": "input",
      "code": "groupBuyName",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageId",
      "name": "页面ID",
      "inputType": "input"
    },
    {
      "name": "拼团时效",
      "inputType": "input",
      "code": "validHours",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "pageName",
      "name": "名称",
      "inputType": "input"
    },
    {
      "name": "设置ID",
      "inputType": "input",
      "code": "settingId",
      "whereCondition": "equal"
      "whereCondition": "equal",
      "code": "state",
      "name": "状态",
      "inputType": "input"
    }
  ],
  "columns": [
    {
      "code": "groupBuyName",
      "cnCode": "拼团名称",
      "desc": "必填，请填写拼团名称",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limitParam": "128",
      "code": "pageName",
      "limitErrInfo": "名称不能超过128",
      "cnCode": "名称",
      "limit": "maxLength",
      "limitParam": "256",
      "limitErrInfo": "拼团名称不能超过256位",
      "show": true
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，名称"
    },
    {
      "code": "groupBuyDesc",
      "cnCode": "拼团简介",
      "desc": "必填，请填写拼团简介",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limitParam": "30",
      "code": "communityId",
      "limitErrInfo": "小区ID不能超过30",
      "cnCode": "小区ID",
      "limit": "maxLength",
      "limitParam": "500",
      "limitErrInfo": "拼团简介不能超过500位",
      "show": true
      "show": true,
      "inputType": "input",
      "required": true,
      "desc": "必填，小区ID"
    },
    {
      "code": "validHours",
      "cnCode": "拼团时效",
      "desc": "必填，请填写拼团时效",
      "required": true,
      "hasDefaultValue": false,
      "limitParam": "512",
      "code": "pageUrl",
      "limitErrInfo": "收据页面不能超过512",
      "cnCode": "收据页面",
      "limit": "maxLength",
      "show": true,
      "inputType": "input",
      "limit": "num",
      "limitParam": "",
      "limitErrInfo": "拼团时效不是有效数字",
      "show": true
    },
    {
      "code": "startTime",
      "cnCode": "开始时间",
      "desc": "必填，请填写开始时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "datetime",
      "limitParam": "",
      "limitErrInfo": "开始时间不是有效日期",
      "show": true
    },
    {
      "code": "endTime",
      "cnCode": "结束时间",
      "desc": "必填，请填写结束时间",
      "required": true,
      "hasDefaultValue": false,
      "inputType": "input",
      "limit": "datetime",
      "limitParam": "",
      "limitErrInfo": "结束时间不是有效日期",
      "show": true
      "desc": "必填，收据页面"
    }
  ]
}

}