Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -231,6 +231,10 @@
     */
    private String secondFamilyId;

    /**
     * 判断唯一的用户编码
     */
    private String uaid;

    private Long sysId;
    /**