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

Pu Zhibing

3 天以前 e7b5f646387af071b879808cef410a698de684d6

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

@@ -83,9 +83,9 @@
    public MgtQuickEntryGetVo getMgtQuickEntry(Long quickEntryId){
        QuickEntry quickEntry = this.getById(quickEntryId);
        if(quickEntry.getTargetType()==1){
            //外链 只要linkType URL APPID
            quickEntry.setJumpType(null);
            quickEntry.setJumpId(null);
            quickEntry.setLinkType(null);
        }else if(quickEntry.getTargetType()==2){
            if(quickEntry.getLinkType()==1){
                quickEntry.setJumpType(null);