Merge remote-tracking branch 'origin/master'

wuzeyu

2024-12-13 e2a6779e69ca96a6d538d415613c8c09963ab659

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java

@@ -268,4 +268,5 @@
    public List<VoSimpleUser> getSimpleUsers() {
        return dao.getSimpleUsers();
    }

}