Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-08-15 2b59293282a3245208531a924173e87518f5a1c1

 ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java

@@ -24,7 +24,7 @@
     * @param pageNum  页码
     * @return 分页实体
     */
    Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum);
    Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status);

    /**
     * 读取excel文件动态加载文件