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

zss

昨天 599b5ff692722226d1e30fbdffc594b826bfa815

 src/main/java/com/ruoyi/project/system/domain/SysDictData.java

@@ -131,7 +131,7 @@


    public boolean getDefault()

    {

        return UserConstants.YES.equals(this.isDefault) ? true : false;

        return UserConstants.YES.equals(this.isDefault);

    }



    public String getIsDefault()