Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/enums/contract/FieldTypeEnum.java

@@ -58,7 +58,8 @@ public enum FieldTypeEnum implements BaseEnum {
     public static Map<String, Object> websitList() {
         Map<String, Object> fieldMap = EnumUtil.getNameFieldMap(FieldTypeEnum.class, "remark");
         ArrayList<FieldTypeEnum> fieldTypeEnums = Lists.newArrayList(CUSTOM, YYYYMMDD, NEXT_YYYY, YYYY, MM,
-                DD, Y_WEBSIT_NAME, Y_WEBSIT_ID, Y_EMAIL, Y_ADDRESS, Y_TEL, Y_FAX, Y_ZIP_CODE, WEBSIT_NAME,
+                DD, Y_WEBSIT_NAME, Y_WEBSIT_ID, Y_EMAIL, Y_ADDRESS, Y_TEL, Y_FAX, Y_ZIP_CODE, Y_BANK_DEPOSIT,
+                Y_BANK_ACCOUNT, Y_LEGAL_NAME, WEBSIT_NAME,
                 SHORT_NAME, ADDRESS, TEL, FAX, ZIP_CODE, BANK_DEPOSIT, BANK_ACCOUNT, CA_LEGAL_NAME);
         Map<String, Object> map = new LinkedHashMap<>();
         for (FieldTypeEnum typeEnum : fieldTypeEnums) {