Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/BannerServiceImpl.java

@@ -60,9 +60,17 @@
        // 将DTO中的属性值复制到横幅对象中
        BeanUtils.copyProperties(mgtBannerEditDto, banner);
        if(banner.getTargetType()==1){
            banner.setJumpType(null);
            banner.setJumpId(null);
            banner.setLinkType(null);
            //外链
            if (banner.getLinkType()==1){
                //外链-链接
                banner.setJumpType(null);
                banner.setJumpId(null);
                banner.setAppid(null);
            }else{
                //外链-小程序
                banner.setJumpType(null);
                banner.setJumpId(null);
            }
        }else if(banner.getTargetType()==2){
            if(banner.getLinkType()==1){
                banner.setJumpType(null);