Merge branch 'import-sxy' into dev

Merge branch 'sxy' into dev
2025-03-12 14:45:39 +08:00 · 2025-03-10 15:18:37 +08:00 · 2025-03-05 15:12:19 +08:00 · 2025-03-05 15:01:17 +08:00 · 2025-03-05 13:50:23 +08:00 · 2025-03-05 11:39:11 +08:00
1 changed files with 1 additions and 1 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "exhibition-register"]
 	path = exhibition-register
 	url = http://192.168.12.3:3000/exhibition/exhibition-register.git
-	branch = wp
+	branch = dev
Author	SHA1	Message	Date
sxy	543b3cc595	Merge branch 'import-sxy' into dev	2025-03-12 14:45:39 +08:00
sxy	bbbdc00759	Merge branch 'sxy' into dev	2025-03-10 15:18:37 +08:00
sxy	2baa91db73	Merge branch 'sxy' into dev	2025-03-05 15:12:19 +08:00
sxy	f45aa0ebe0	Merge branch 'sxy' into dev	2025-03-05 15:01:17 +08:00
sxy	3b83210f38	Merge branch 'sxy' into dev	2025-03-05 13:50:23 +08:00
sxy	4e0b3e424b	Merge branch 'sxy' into dev	2025-03-05 11:39:11 +08:00
sxy	98f7cd1546	Merge branch 'sxy' into dev	2025-03-04 15:06:16 +08:00
sxy	d3290e6473	Merge branch 'sxy' into dev	2025-03-04 14:59:59 +08:00
sxy	363b581b90	Merge branch 'sxy' into dev	2025-03-04 13:34:27 +08:00
workabee	27c9050279	Merge branch 'wp' into dev	2024-09-10 18:55:25 +08:00
workabee	824b463e75	Merge branch 'wp' into dev	2024-09-10 18:48:41 +08:00
workabee	e15fec2d2e	Merge branch 'wp' into dev	2024-09-10 11:25:39 +08:00
workabee	eae5849a3b	Merge branch 'wp' into dev	2024-09-10 11:17:57 +08:00
workabee	8d71a867d6	Merge branch 'wp' into dev	2024-09-10 11:11:22 +08:00
workabee	b4779262a3	Merge branch 'wp' into dev	2024-09-10 09:50:27 +08:00
workabee	11aab8dcbb	Merge branch 'wp' into dev	2024-07-19 15:35:26 +08:00
workabee	047e4eee7f	Merge branch 'wp' into dev # Conflicts: # .gitmodules	2024-07-19 09:12:38 +08:00
workabee	74ab1b3f44	更新	2024-03-21 15:09:06 +08:00