Commit Graph

24 Commits

Author SHA1 Message Date
d6eba90175 s 2023-10-30 17:20:39 +08:00
acd2d4a135 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	unpackage/dist/index.html
#	unpackage/dist/static/pageData.json
2023-10-30 17:17:51 +08:00
dad372d0b2 s 2023-10-30 17:17:14 +08:00
张 元山
2fa75ca677 Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-admission-fee 2023-10-30 16:34:06 +08:00
张 元山
5829afca55 add gitignore 2023-10-30 16:33:27 +08:00
c7ddd149a8 Merge remote-tracking branch 'origin/master' 2023-10-30 15:56:38 +08:00
9df37f645a s 2023-10-30 15:56:30 +08:00
张 元山
108ce42206 fix ticket data 2023-10-30 15:44:24 +08:00
4d9f09d91d Merge remote-tracking branch 'origin/master' 2023-10-30 14:08:33 +08:00
4f286413dd s 2023-10-30 14:08:16 +08:00
张 元山
a270e0cac9 fix ticket data 2023-10-30 13:36:28 +08:00
adc049f3e9 s 2023-10-30 12:00:38 +08:00
张 元山
d5b6b30cd2 fix my 2023-10-30 10:45:04 +08:00
张 元山
6618cd2966 Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-admission-fee 2023-10-30 10:43:22 +08:00
张 元山
dbc683e089 fix pageheader 2023-10-30 10:42:28 +08:00
张 元山
4d1e61ea55 fix ticket style 2023-10-28 17:05:10 +08:00
张 元山
dc4780b061 fix ticket 2023-10-28 16:56:32 +08:00
4a706b0ba2 s 2023-10-27 16:46:54 +08:00
张 元山
181a62b159 add ticket 2023-10-27 16:43:30 +08:00
3cf407e0d9 s 2023-10-27 14:58:37 +08:00
0accd0d725 s 2023-10-27 14:19:18 +08:00
80441b9dfd s 2023-10-27 14:18:52 +08:00
b5e192d4b3 s 2023-10-27 13:42:32 +08:00
b0c8842ee1 first-submit 2023-10-27 13:40:47 +08:00