From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 15 六月 2023 18:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 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