Merge remote-tracking branch 'origin/master'

jiangping

2024-05-27 f360321afa268f8d4e6c19e9a45eaf9f70c770b2

 server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -48,7 +48,6 @@
    private String empNo;

    @ApiModelProperty(value = "生日")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date birthday;

    @ApiModelProperty(value = "性别")