diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java index 892b799..9acaf43 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenAcceptRecordCO.java @@ -83,5 +83,7 @@ public class HiddenAcceptRecordCO extends ClientObject { //环境 @ApiModelProperty(value = "环境") private String env; + @ApiModelProperty(value = "打回意见") + private String rejectOpinion; } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml index 831188d..ab466fd 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenMapper.xml @@ -50,10 +50,10 @@ + GROUP BY h.id HAVING hidden_find_user_name LIKE CONCAT('%', #{params.hiddenFindUserName}, '%') - GROUP BY h.id ORDER BY h.create_time desc