Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProviderInfoController.java

@@ -222,5 +222,10 @@ public class ProviderInfoController {
         return providerInfoService.importData(request,file);
     }
 
+    @RequestMapping("/exportData")
+    public HttpRespMsg exportData(HttpServletRequest request){
+        return providerInfoService.exportData(request);
+    }
+
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import java.util.List;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-28
+ * @since 2022-08-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -158,6 +158,18 @@ public class TimeType extends Model<TimeType> {
     @TableField("custom_data_status")
     private Integer customDataStatus;
 
+    /**
+     * 工时填报数值收集字段最大值是否限制 0-否 1-是
+     */
+    @TableField("custom_data_max_status")
+    private Integer customDataMaxStatus;
+
+    /**
+     * 工时填报数值收集字段最大值限制
+     */
+    @TableField("custom_data_max_value")
+    private Integer customDataMaxValue;
+
     /**
      * 财务成本导入是否需要审核
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProviderInfoService.java

@@ -18,4 +18,6 @@ import javax.servlet.http.HttpServletRequest;
 public interface ProviderInfoService extends IService<ProviderInfo> {
 
     HttpRespMsg importData(HttpServletRequest request, MultipartFile file);
+
+    HttpRespMsg exportData(HttpServletRequest request);
 }