From 15047d62d27fbe4f99b7f93292c2cf9709b7cc97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:53:39 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
index 25769f8..9edf118 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
@@ -32,25 +32,23 @@
@TableField(exist = false)
private Map<String, Object> map;
- public static BaseParam build(Map<String, Object> map) {
- BaseParam param = new BaseParam();
+ public void syncMap(Map<String, Object> map) {
if (null == map) {
- return param;
+ return;
}
if (null != map.get("current")) {
- param.setCurrent(Integer.parseInt(String.valueOf(map.get("current"))));
+ this.setCurrent(Integer.parseInt(String.valueOf(map.get("current"))));
map.remove("current");
}
if (null != map.get("pageSize")) {
- param.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize"))));
+ this.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize"))));
map.remove("pageSize");
}
if (null != map.get("condition")) {
- param.setCondition(String.valueOf(map.get("condition")));
+ this.setCondition(String.valueOf(map.get("condition")));
map.remove("condition");
}
- param.setMap(map);
- return param;
+ this.setMap(map);
}
}
--
Gitblit v1.9.1