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

2023-06-19 16:39:59 +08:00
parent 459436512c b5b8d05303
commit 0323e5fe25
3 changed files with 9 additions and 0 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java
@@ -100,6 +100,7 @@ public class FeiShuServiceImpl implements FeiShuService {
                        if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong)
                                || (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) {
                            freeBusyInfo.setFree(false);
+                            break;
                        }
                    }