Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

1
2
3
4
5
6
7
8
9
10
11
12
13
14
package com.ruoyi.personnel.dto;
 
import com.ruoyi.personnel.pojo.PersonRewardPunishmentRecord;
import lombok.Data;
 
@Data
public class PersonRewardPunishmentRecordDto extends PersonRewardPunishmentRecord {
 
    private String userName;
 
    private String account;
 
    private String createUserName;
}