Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

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