问题处理

hx-common/src/main/java/com/fjhx/common/utils/AuthorityUtils.java

@@ -1,5 +1,6 @@
 package com.fjhx.common.utils;
 
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -7,14 +8,13 @@ import com.ruoyi.system.utils.UserUtil;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
 
 public class AuthorityUtils {
 
     /**
      * OA相关模块财务特殊权限
      */
-    public static <V> void cofAuthority(String alias, Function<V, Long> getCompanyIdFun, IWrapper<V> wrapper) {
+    public static <V> void cofAuthority(String alias, SFunction<V, Long> getCompanyIdFun, IWrapper<V> wrapper) {
         //权限过滤 财务看全部
         List<String> userRoleKeys = UserUtil.getUserRoleKeys(SecurityUtils.getUserId());
         if (!userRoleKeys.contains("cfo")) {

hx-oa/src/main/java/com/fjhx/oa/entity/activity/po/ActivityPriceInventory.java

@@ -90,7 +90,7 @@ public class ActivityPriceInventory extends BasePo {
     /**
      * 活动天数
      */
-    private Integer activityDays;
+    private String activityDays;
 
     /**
      * 活动开始时间