Merge remote-tracking branch 'origin/master'

zss

2024-07-30 8dcefe8d8faa04997e75aa0f8c62b6e715d81b98

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

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

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

    private String department;
}