Merge branch 'dev_dz' into dev

zhuo

2025-03-22 687dfeb52ba6bdc3717e72af373ed60506ac48bf

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;
}