Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/entity/GetWorkContactEmployeeHandle.java

@@ -16,8 +16,8 @@ public class GetWorkContactEmployeeHandle {
     private String name;
     private Integer startDeletedAt;
     private Integer endDeletedAt;
-    private Integer startCreatedAt;
-    private Integer endCreatedAt;
+    private String startCreatedAt;
+    private String endCreatedAt;
     private Integer groupId;
     private Integer corpId;
     private List employeeId;

src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -181,8 +181,8 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
         String name = handle.getName();
         Integer startDeletedAt = handle.getStartDeletedAt();
         Integer endDeletedAt = handle.getEndDeletedAt();
-        Integer startCreatedAt = handle.getStartCreatedAt();
-        Integer endCreatedAt = handle.getEndCreatedAt();
+        String startCreatedAt = handle.getStartCreatedAt();
+        String endCreatedAt = handle.getEndCreatedAt();
         Integer group_id = handle.getGroupId();
         Integer corpId = handle.getCorpId();
         List employeeId = handle.getEmployeeId();

src/main/resources/application-test.properties

@@ -36,5 +36,6 @@ xxl.sso.logout.path=/logout
 xxl-sso.excluded.paths=
 xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 
-menu.host=http://test.space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=
+menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
+