Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-06-05 70f08b8141b9ef7acb987ffdd59c94583f26a1c5

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallImplImplClient.java

@@ -25,7 +25,7 @@

   @Override
   @GetMapping(CREATE_OUT_CALL_TASK_JOB_HANDLER)
   public Object createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
   public String createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
      Map<String, Object> map = new HashMap<>();
      map.put("isOver",isOver);
      map.put("taskScheduleTime",taskScheduleTime);
@@ -44,7 +44,7 @@
    * @return
    */
   @Override
   public Object testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
   public String testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
      Map<String, Object> map = new HashMap<>();
      map.put("isOver",isOver);
      map.put("taskScheduleTime",taskScheduleTime);