Merge remote-tracking branch 'origin/master'

k94314517

2025-03-07 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3

 server/system_service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -96,6 +96,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ExcelColumn(name="入职日期",index =9,width = 10, dateFormat = "yyyy-MM-dd")
    private Date jobDate;
    @ApiModelProperty(value = "姓名拼音首字母")
    private String pinyin;
    @ApiModelProperty(value = "培训结束时间")
    @TableField(exist = false)
    @ExcelColumn(name="培训结束时间",index =10,width = 10, dateFormat = "yyyy-MM-dd")