Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -31,4 +31,9 @@
    private String otherPosition;

    private String otherPolitical;

    /**
     * 分享人
     */
    private Integer shareId;
}