From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 14 八月 2023 09:35:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java index 4c6dd5e..6d999f4 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java +++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BladeQueryObject.java @@ -5,13 +5,14 @@ import org.springblade.core.mp.support.Query; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; /** * 鍥犱负褰撳墠妗嗘灦浣跨敤鐨勬槸query鏉ュ仛鍒嗛〉锛� - * 鎵�浠ユ垜杩欒竟鍙傜収浠ュ墠鐨凚ladeQueryObject鏉ヤ慨鏀� - * 涓�涓綋鍓嶆鏋朵娇鐢ㄨ捣鏉ユ柟渚夸竴鐐圭殑瀵硅薄 + * 鎵�浠ユ垜杩欒竟鍙傜収浠ュ墠鐨凚aseQueryObject鏉ヤ慨鏀圭殑 * @author ludc * @date 2023/5/23 13:00 */ @@ -25,7 +26,7 @@ @JSONField private Map<String, Object> conditionMap = new HashMap(); @JSONField - private int page = 1; + private Integer page = 1; @JSONField private String sort; @JSONField -- Gitblit v1.9.3