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

# Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java
2023-06-27 15:42:48 +08:00
parent 300948de25 945616ae0c
commit 313bbdfe53
34 changed files with 663 additions and 202 deletions
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
@@ -29,6 +29,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;

 /**