# Conflicts:

#	suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/ShopUserTypeComponent.java

suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java

@@ -144,7 +144,7 @@ public class SysUserController extends BaseController
      * @return
      */
     @GetMapping("/getManagerList")
-    public AjaxResult getManagerList(@RequestParam(value = "depCode") String depCode , @RequestParam(value = "userNo") String userNo)
+    public AjaxResult getManagerList(@RequestParam(value = "depCode" , required = false) String depCode , @RequestParam(value = "userNo", required = false) String userNo)
     {
         String rusult = analysisDiyCustomerComponent.getManagerList(depCode,userNo);
         return new  AjaxResult(00000, rusult);

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/ShopUserTypeComponent.java

@@ -115,7 +115,7 @@ public class ShopUserTypeComponent {
                 calendar.set(Calendar.MILLISECOND, 0);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 String runTime = sdf.format(calendar.getTime());
-                if (runTime.contains("2025-11-29")){
+                if (runTime.contains("2025-11-25")){
                     runTime = "2025-08-28T00:00";
                 }
                 stoneParams.put("datetime_start", runTime);
@@ -204,7 +204,7 @@ public class ShopUserTypeComponent {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
                 Date date = sdf.parse(truncatedDate);
                 String runTime = sdf.format(date);
-                if (runTime.contains("2025-11-29")){
+                if (runTime.contains("2025-11-25")){
                     runTime = "2025-08-28T00:00";
                 }
                 //获取上次同步时间进行增量同步