'冲突修改'

config/base.config.json

-<<<<<<< HEAD
 {"userRegister":{"useType":{"memberType":[],"businessType":[]},"useDetail":[]},"global":{"logo":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/logo.png","countryList":[{"name":"简体中文-ZH","key":"cn","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}]}}
-=======
-{"userRegister":{"useType":{"memberType":[{"id":1,"typeName":"企业会员"},{"id":2,"typeName":"个人会员"},{"id":3,"typeName":"渠道企业会员"},{"id":4,"typeName":"渠道个人会员"}],"businessType":[{"id":1,"typeName":"商品销售"},{"id":2,"typeName":"加工服务"},{"id":3,"typeName":"物流服务"},{"id":4,"typeName":"金融服务"},{"id":5,"typeName":"保险服务"},{"id":6,"typeName":"采购"},{"id":7,"typeName":"游戏"}]},"useDetail":[{"groupName":"联系信息","elements":[{"id":62,"fieldName":"contact","fieldCNName":"联系人","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":63,"fieldName":"fixed_contact_number","fieldCNName":"固定联系电话","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":64,"fieldName":"phone_number","fieldCNName":"手机号码","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":65,"fieldName":"fax_number","fieldCNName":"传真号码","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":66,"fieldName":"address","fieldCNName":"地址","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":67,"fieldName":"zip_code","fieldCNName":"邮编","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":68,"fieldName":"url","fieldCNName":"网址","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":69,"fieldName":"email","fieldCNName":"邮箱","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"营业执照信息","elements":[{"id":47,"fieldName":"enterprise_type","fieldCNName":"企业类型","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":48,"fieldName":"residence","fieldCNName":"住所","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":49,"fieldName":"legal_representative","fieldCNName":"法定代表人","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":50,"fieldName":"register_capital","fieldCNName":"注册资本","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":51,"fieldName":"establish_date","fieldCNName":"成立日期","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":52,"fieldName":"business_term","fieldCNName":"营业期限","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":53,"fieldName":"business_scope","fieldCNName":"经营范围","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":54,"fieldName":"registration_authority","fieldCNName":"登记机关","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":55,"fieldName":"registration_time","fieldCNName":"登记时间","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":56,"fieldName":"unified_social_credit_code","fieldCNName":"统一社会信用代码","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":57,"fieldName":"business_license","fieldCNName":"营业执照","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"填写会员基本信息","elements":[{"id":38,"fieldName":"member_type","fieldCNName":"会员类型","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":39,"fieldName":"MEMBER_ROLE","fieldCNName":"会员角色","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":40,"fieldName":"member_level","fieldCNName":"会员等级","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":41,"fieldName":"REGISTER_PHONE","fieldCNName":"注册手机号","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":42,"fieldName":"register_email","fieldCNName":"注册邮箱","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"法定代表人信息","elements":[{"id":60,"fieldName":"legal_id_card","fieldCNName":"法人身份证号","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":61,"fieldName":"legal_id_card_information","fieldCNName":"法人身份证信息","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":58,"fieldName":"legal_name","fieldCNName":"法人姓名","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":59,"fieldName":"legal_phone","fieldCNName":"法人手机号","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"企业信息","elements":[{"id":3,"fieldName":"company_name","fieldCNName":"公司名称","fieldType":null,"fieldLength":128,"fieldEmpty":1,"fieldOrder":1,"fieldRemark":"","checkRules":[]},{"id":4,"fieldName":"company_type","fieldCNName":"公司类型","fieldType":null,"fieldLength":128,"fieldEmpty":0,"fieldOrder":2,"fieldRemark":"","checkRules":[]}]},{"groupName":"填写渠道信息","elements":[{"id":43,"fieldName":"channel_level","fieldCNName":"渠道级别","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":44,"fieldName":"channel_type","fieldCNName":"渠道类型","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":45,"fieldName":"agent_city","fieldCNName":"代理地市","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]},{"id":46,"fieldName":"channel_describe","fieldCNName":"渠道描述","fieldType":null,"fieldLength":100,"fieldEmpty":0,"fieldOrder":1,"fieldRemark":"test","checkRules":[]}]},{"groupName":"444","elements":[{"id":1,"fieldName":"444","fieldCNName":"44","fieldType":null,"fieldLength":44,"fieldEmpty":1,"fieldOrder":44,"fieldRemark":null,"checkRules":[]}]}]},"global":{"logo":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/logo.png","countryList":[{"name":"简体中文-ZH","key":"cn","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}]}}
->>>>>>> 77a07cfd4b18829b12dca1283ad0b08f70da3239

package.json

@@ -51,11 +51,7 @@
     "chalk": "^4.1.0",
     "clone": "^2.1.2",
     "fs-extra": "^9.0.1",
-<<<<<<< HEAD
-    "god-yapi2ts": "1.6.0",
-=======
     "god-yapi2ts": "^1.6.0",
->>>>>>> 77a07cfd4b18829b12dca1283ad0b08f70da3239
     "gulp": "^4.0.2",
     "json2ts": "^0.0.7",
     "ora": "^4.0.4"