diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index e7b7eea2..799b14aa 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-dependencies - 3.1.8 + 3.1.9 @@ -60,21 +60,21 @@ 4.3.0 3.9.1 2.7.5 - 3.26.0 - 2.6.5 + 3.27.1 + 2.6.6 3.1.1 1.3.0 1.6.2 3.3.3 15.4 2.1.0 - 1.12.651 - 2.5.0 + 1.12.675 + 2.6.0 4.5.0 1.5.1 - 2.14.4 - 3.1.7 - 5.8.25 + 2.14.5 + 3.1.9 + 5.8.26 1.6.0 2.43.0 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java index 87809440..b82bd7b2 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java @@ -18,6 +18,7 @@ package top.charles7c.continew.starter.extension.crud.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; +import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; @@ -41,6 +42,7 @@ public class BaseDetailResp extends BaseResp { * 修改人 */ @JsonIgnore + @ConditionOnPropertyNotNull @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "updateUserString")) private Long updateUser;