Merge remote-tracking branch 'origin/master'

Fancy

2025-01-16 c07eb0467fd3f3ee8321721acc5977f0f84e38c2

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/RoleSv.java

@@ -55,6 +55,7 @@
     * @param disabled
     * @return
     */
    @Transactional
    public int disabled(Long id,Boolean disabled) {
        BaRole role=new BaRole();
        role.id=id;