Merge remote-tracking branch 'origin/master'

zss

2024-08-08 bc7ee9878359b52c666c7c5f386a8e0c65d2056f

 user-server/src/main/java/com/yuanchu/mom/pojo/Person.java

@@ -33,4 +33,6 @@

    @ApiModelProperty(">1：存在 =0：不存在")
    private Long isLive;

    private String department;
}