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

Pu Zhibing

2025-06-18 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStaffEditDto.java

@@ -59,4 +59,7 @@
        @NotNull(message = "负责人标记不能为空")
        private String headFlag;

        @ApiModelProperty(value = "微信userId")
        private String wxUserId;

}