Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-07-27 38a2db2a4b3a67e27d874f0f2fdb64cff3325ccf

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentDetailQueryCriteria.java

@@ -5,10 +5,10 @@

public class RewardPunishmentDetailQueryCriteria {
        
    //员工（多个用逗号隔开）
    //员工
    @Query()
    private String personId;
    //员工（多个用逗号隔开）
    //员工
    public String getPersonId() {
        return personId;
    }