Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-06 2b4511ca363e74343e1cb678c23a9e7638800a3f

 cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java

@@ -35,7 +35,7 @@
    /**
     * 获取 没有学员信息的图片配置
     */
    @PostMapping("/imgConfig/getNoneStu")
    @PostMapping("/base/imgConfig/getNoneStu")
    public List<TImgConfig> getDriver(){
        return imgConfigService.list(new QueryWrapper<TImgConfig>()
                .eq("position", 1));
@@ -59,7 +59,7 @@
    }


    @PostMapping("/imgConfig/getBenefitImage")
    @PostMapping("/base/imgConfig/getBenefitImage")
    public UserBenefitImage getImageConfig(){
        UserBenefitImage image = new UserBenefitImage();
        ArrayList<Integer> integers = new ArrayList<>();