diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java index 3d48668..3cf8d8e 100644 --- a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java +++ b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java @@ -43,7 +43,7 @@ public class ScoreInfoManager { LoginUser loginUser = SecurityUtils.getLoginUser(); RewScoreInfo rewScoreInfo = Convert.convert(RewScoreInfo.class, scoreInfo); rewScoreInfo.setCreateId(loginUser.getUserId()); - if(StringUtils.isNotEmpty(scoreInfo.getId())){ + if(StringUtils.isNotEmpty(scoreInfo.getScoreId())){ rewScoreInfo.setUpdateTime(new Date()); rewScoreInfo.setUpdateBy(loginUser.getUsername()); }else{ diff --git a/hyp-system/src/main/java/com/hyp/system/domain/RewScoreInfo.java b/hyp-system/src/main/java/com/hyp/system/domain/RewScoreInfo.java index 96563a9..c39fa24 100644 --- a/hyp-system/src/main/java/com/hyp/system/domain/RewScoreInfo.java +++ b/hyp-system/src/main/java/com/hyp/system/domain/RewScoreInfo.java @@ -25,7 +25,7 @@ public class RewScoreInfo extends BaseEntity { * 主键 */ @TableId(type = IdType.ASSIGN_UUID) - private String id; + private String scoreId; /** * 评分 diff --git a/hyp-system/src/main/java/com/hyp/system/domain/dto/ScoreInfoSaveDTO.java b/hyp-system/src/main/java/com/hyp/system/domain/dto/ScoreInfoSaveDTO.java index cf02a92..f2e6cbc 100644 --- a/hyp-system/src/main/java/com/hyp/system/domain/dto/ScoreInfoSaveDTO.java +++ b/hyp-system/src/main/java/com/hyp/system/domain/dto/ScoreInfoSaveDTO.java @@ -17,7 +17,7 @@ public class ScoreInfoSaveDTO implements Serializable { /** * 主键 */ - private String id; + private String scoreId; /** * 评分 diff --git a/hyp-system/src/main/resources/mapper/system/RewScoreInfoMapper.xml b/hyp-system/src/main/resources/mapper/system/RewScoreInfoMapper.xml index 34e895f..be671d8 100644 --- a/hyp-system/src/main/resources/mapper/system/RewScoreInfoMapper.xml +++ b/hyp-system/src/main/resources/mapper/system/RewScoreInfoMapper.xml @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - id,score,apply_id, + score_id,score,apply_id, create_id,create_by,create_time, update_by,update_time,remark