Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99

 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java

@@ -2,7 +2,7 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.matrix.biz.dao.BizUserDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
@@ -40,7 +40,7 @@
    private ShoppingGoodsDao shoppingGoodsDao;
    
    @Autowired
    private BizUserDao bizUserDao;
    private SysVipInfoDao sysVipInfoDao;
    
    @Autowired
    private ShopProductDao shopProductDao;