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

src/main/java/com/syc/slm/slmbi/entity/BusinessConfig.java

@@ -23,7 +23,5 @@ public class BusinessConfig extends BaseEntity<BusinessConfig>{
     private String nameCn;
     @ApiModelProperty(value = "表字段属性")
     private String  field;
-    @ApiModelProperty(value = "表字段时间属性")
-    private String fieldTime;
 
 }

src/main/java/com/syc/slm/slmbi/service/impl/BusinessConfigServiceImpl.java

@@ -47,9 +47,6 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
                     if(StringUtils.isNotBlank(x.getField())) {
                         x.setField(URLDecoder.decode(x.getField(), StandardCharsets.UTF_8.name()));
                     }
-                    if(StringUtils.isNotBlank(x.getFieldTime())) {
-                        x.setFieldTime(URLDecoder.decode(x.getFieldTime(), StandardCharsets.UTF_8.name()));
-                    }
                 }catch (Exception e){
                     e.printStackTrace();
                     throw new SysException("请联系管理员，数据转化出错了");
@@ -69,9 +66,6 @@ public class BusinessConfigServiceImpl extends ServiceImpl<BusinessConfigMapper,
             if(StringUtils.isNotBlank(co.getField())) {
                 co.setField(URLDecoder.decode(co.getField(), StandardCharsets.UTF_8.name()));
             }
-            if(StringUtils.isNotBlank(co.getFieldTime())) {
-                co.setFieldTime(URLDecoder.decode(co.getFieldTime(), StandardCharsets.UTF_8.name()));
-            }
         }catch (Exception e){
             e.printStackTrace();
             throw new SysException("请联系管理员，数据转化出错了");