Merge remote-tracking branch 'origin/master'

luxiaotao1123

2024-12-27 6200b69a0aa66865bd94bc159ff823fc97013811

 zy-acs-framework/src/main/resources/templates/react-admin/Entity.txt

@@ -36,15 +36,4 @@
        }
    }

    public Boolean getDeletedBool(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }
}