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

lxp

2025-03-13 b7c4edd36912d26aa2e8e6fa5605c370bb2e478a

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