1125/wanwenjings #2

Closed
wanwenjing wants to merge 4 commits from 1125/wanwenjings into master
There is no content yet.
wanwenjing added 4 commits 2024-11-27 00:13:09 +08:00
e0f9840709 Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing
# Conflicts:
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
wanwenjing closed this pull request 2024-11-27 00:13:35 +08:00
wanwenjing deleted branch 1125/wanwenjings 2024-11-27 00:23:23 +08:00

Pull request closed

Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: teaching/2204a-cloud-server#2
There is no content yet.