diff --git a/.idea/xm-backend.iml b/.idea/xm-backend.iml
index b738ec29..106f8339 100644
--- a/.idea/xm-backend.iml
+++ b/.idea/xm-backend.iml
@@ -63,7 +63,6 @@
-
@@ -89,7 +88,7 @@
-
+
@@ -116,6 +115,8 @@
+
+
@@ -133,6 +134,7 @@
+
diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml
index a484d779..be4afede 100644
--- a/xm-bootstrap/xm-bootstrap.iml
+++ b/xm-bootstrap/xm-bootstrap.iml
@@ -60,7 +60,6 @@
-
@@ -129,7 +128,8 @@
-
+
+
@@ -194,7 +194,7 @@
-
+
@@ -221,6 +221,7 @@
+
diff --git a/xm-core/pom.xml b/xm-core/pom.xml
index 6f13e40d..bfe5fc3a 100644
--- a/xm-core/pom.xml
+++ b/xm-core/pom.xml
@@ -24,6 +24,11 @@
mdp-tpa-client
${mdp.version}
+
+ com.mdp
+ mdp-ds
+ ${mdp.version}
+
com.mdp
mdp-oauth2-client
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 9228b899..deb06b23 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -31,6 +31,7 @@
)
and res.product_name like #{key}
+ and ctime between #{ctimeStart} and #{ctimeEnd}
@@ -61,6 +62,7 @@
or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id)
)
+ and ctime between #{ctimeStart} and #{ctimeEnd}
diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml
index 3a163e06..c652dc33 100644
--- a/xm-core/xm-core.iml
+++ b/xm-core/xm-core.iml
@@ -27,7 +27,6 @@
-
@@ -40,6 +39,11 @@
+
+
+
+
+
@@ -77,7 +81,6 @@
-
@@ -109,7 +112,7 @@
-
+
@@ -125,7 +128,6 @@
-