mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
Owner
No description provided.
wangyang added 179 commits 2025-08-28 10:10:35 +08:00
b7e083feaf Merge branch 'new_main' into mcy_new
# Conflicts:
#	making_school_asignment_app/lib/routes/app_pages.dart
#	making_school_asignment_app/lib/routes/app_routes.dart
122fc97f5e Merge branch 'new_main' into mcy_new
# Conflicts:
#	making_school_asignment_app/lib/common/api/retrofit_client.dart
#	making_school_asignment_app/lib/common/api/retrofit_client.g.dart
d3509a2eee Merge branch 'mcy_new' into new_main
# Conflicts:
#	making_school_asignment_app/lib/page/home_page/home_view.dart
cbd5b724e9 Merge branch 'new_main' into mcy_new
# Conflicts:
#	making_school_asignment_app/lib/page/home_page/home_view.dart
9518308e80 Merge branch 'new_main' into mcy_new
# Conflicts:
#	making_school_asignment_app/pubspec.yaml
d1fd1fb1bc Merge branch 'mcy_new' into zoom_pic
# Conflicts:
#	making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart
#	making_school_asignment_app/pubspec.yaml
wangyang merged commit 5f4c9237c1 into master 2025-08-28 10:10:45 +08:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
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: marking/Making.School.Asignment.app#1
No description provided.