Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-17 464e2819756afef1228aaa7732c6ae8028be32a1

 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java

@@ -48,7 +48,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
        int num=iElseAccessoryService.countNum(Name,ids);
        return getDataTable(list,num);
    }