Merge branch 'score_shop' into api_score_meger

jyy

2021-08-06 5f95864f021254fba9881cf0c738dc49d1f84b71

Merge branch 'score_shop' into api_score_meger

 zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java

@@ -78,8 +78,6 @@
     */
    @RequestMapping(value = "/all")
    public @ResponseBody AjaxResult all(SysVipLevel sysVipLevel) {
        SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        sysVipLevel.setShopId(users.getShopId());
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardLevelService.findByModel(sysVipLevel), null);
    }
}

 zq-erp/src/main/java/findC.java

@@ -34,7 +34,7 @@

                        traverseFolder(file2);
                    } else {
                        if(file2.length()>_1mb*100){
                        if(file2.length()>_1mb*50){
                            System.out.println( file2.length()/_1mb+"MB"+"\t"+file2.getAbsolutePath());
                        }
                    }