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

liyong

7 天以前 23cb707e9d6b716c8a5f9c79956845cf8df523c7

 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()