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

vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeMeetingCalendarInfoController.java

@@ -122,4 +122,16 @@ public class HotakeMeetingCalendarInfoController extends BaseController
         List<HotakeMeetingCalendarDataDto> list = hotakeMeetingCalendarInfoService.selectHotakeMeetingCalendarDataDtoList();
         return R.ok(list,"");
     }
+
+
+    /**
+     * 获取当前候选人即将开始的会议信息
+     */
+    @ApiOperation("获取当前候选人即将开始的会议信息")
+    @GetMapping(value = "/getCandidateStartCalendarInfo")
+    public R<HotakeMeetingCalendarInfo> getCandidateStartCalendarInfo()
+    {
+        return R.ok(hotakeMeetingCalendarInfoService.selectCandidateStartCalendarInfo());
+    }
+
 }

vetti-admin/src/main/resources/application-druid.yml

@@ -138,6 +138,7 @@ twilio:
         reply-to-em7941: noreply@em7941.routez.app
         template-ids:
             routez-verification-code: d-18475c5d41e349e2bc3a35f2b4992182
+            interview-template-code: d-c377f1e7f5e04cb794e2753af9d2e0c8
     accountSID: 1111
     authToken: 22222
     sendPhoneNumber: 33333