wushaofeng
|
7f96ccca8b
|
Merge remote-tracking branch 'origin/master'
|
2020-12-30 17:18:16 +08:00 |
|
wushaofeng
|
cf41c0e75f
|
完成筛选页面--By Ternece
|
2020-12-30 17:17:52 +08:00 |
|
czm
|
4200a7c5de
|
admin page update
|
2020-12-30 17:09:04 +08:00 |
|
czm
|
307523b3be
|
Merge remote-tracking branch 'origin/master'
|
2020-12-30 16:49:52 +08:00 |
|
czm
|
e3fd87ce21
|
admin page update
|
2020-12-30 16:49:37 +08:00 |
|
wushaofeng
|
6ab33b7c64
|
Merge remote-tracking branch 'origin/master'
|
2020-12-30 16:39:53 +08:00 |
|
wushaofeng
|
25371bad43
|
完成试卷生成的方法 final--By Ternece
|
2020-12-30 16:39:28 +08:00 |
|
czm
|
8be8ca7cb4
|
admin page and log update
|
2020-12-30 15:06:48 +08:00 |
|
czm
|
20f6db1dc6
|
Merge remote-tracking branch 'origin/master'
|
2020-12-30 14:42:34 +08:00 |
|
czm
|
fa0eb26d9a
|
admin page and log update
|
2020-12-30 14:41:49 +08:00 |
|
alvis
|
299cdd1770
|
Merge pull request #32 from mindskip/alvis
bug fix
|
2020-12-30 09:46:50 +08:00 |
|
alvis
|
9326ca716b
|
!37 bug fix
Merge pull request !37 from alvis/alvis
|
2020-12-30 09:45:53 +08:00 |
|
alvis
|
6d2ab99fa3
|
Merge branch 'alvis' of github.com:mindskip/xzs-mysql into alvis
|
2020-12-30 09:44:06 +08:00 |
|
alvis
|
898159ab3a
|
Merge branch 'alvis' of gitee.com:mindskip/xzs-mysql into alvis
|
2020-12-30 09:43:24 +08:00 |
|
alvis
|
2ecbee9561
|
bug fix
|
2020-12-30 09:41:59 +08:00 |
|
alvis
|
8ad34b997e
|
bug fix
|
2020-12-30 09:41:50 +08:00 |
|
思维跳跃科技
|
004a3f5668
|
!36 sync
Merge pull request !36 from 思维跳跃科技/master
|
2020-12-29 19:04:58 +08:00 |
|
思维跳跃科技
|
095ba9f694
|
!35 sync
Merge pull request !35 from 思维跳跃科技/master
|
2020-12-29 19:04:36 +08:00 |
|
思维跳跃科技
|
8f227774ea
|
Merge pull request #31 from mindskip/master
sync
|
2020-12-29 19:03:05 +08:00 |
|
思维跳跃科技
|
b9efae5595
|
Merge pull request #30 from mindskip/master
update
|
2020-12-29 19:00:29 +08:00 |
|
mindskip
|
951f44a105
|
Merge branch 'master' of github.com:mindskip/xzs-mysql
# Conflicts:
# README.md
|
2020-12-29 18:58:06 +08:00 |
|
思维跳跃科技
|
ce22c048de
|
!34 文档更新
Merge pull request !34 from 思维跳跃科技/skill
|
2020-12-29 18:51:11 +08:00 |
|
mindskip
|
4b87315419
|
revert
|
2020-12-29 18:47:33 +08:00 |
|
思维跳跃科技
|
f78f7bf5f4
|
!33 分支同步
Merge pull request !33 from 思维跳跃科技/master
|
2020-12-29 18:41:50 +08:00 |
|
wushaofeng
|
21ee444e3f
|
完成试卷生成的方法 test3--By Ternece
|
2020-12-29 17:34:50 +08:00 |
|
wushaofeng
|
57c275e242
|
完成试卷生成的方法 test2--By Ternece
|
2020-12-29 17:17:23 +08:00 |
|
wushaofeng
|
e4b01330ae
|
完成试卷生成的方法--By Ternece
|
2020-12-29 16:42:57 +08:00 |
|
mindskip
|
65d0169aa7
|
revert
|
2020-12-29 16:16:39 +08:00 |
|
mindskip
|
60882a1d47
|
skill
|
2020-12-29 16:09:36 +08:00 |
|
czm
|
78435af514
|
admin question and static update
|
2020-12-29 14:27:24 +08:00 |
|
czm
|
9b30d479fd
|
admin and student static update
|
2020-12-29 11:36:06 +08:00 |
|
czm
|
5b1e48e301
|
admin update
|
2020-12-29 10:05:18 +08:00 |
|
czm
|
27fe05a636
|
Merge remote-tracking branch 'remotes/origin/feature/tek-system-ui' into skill
|
2020-12-28 18:01:07 +08:00 |
|
jimmy
|
689da6d2ac
|
Change industry api: by jimmy
|
2020-12-28 15:37:05 +08:00 |
|
czm
|
d3e39b3d6c
|
Merge remote-tracking branch 'remotes/origin/feature/tek-system-ui' into skill
|
2020-12-28 15:12:36 +08:00 |
|
jimmy
|
8d5c1a616f
|
Update url :by jimmy
|
2020-12-28 15:11:57 +08:00 |
|
czm
|
6b4fc9ed42
|
Merge remote-tracking branch 'remotes/origin/feature/tek-system-ui' into skill
|
2020-12-28 15:09:22 +08:00 |
|
jimmy
|
1f03b484d1
|
Update api url: by jimmy
|
2020-12-28 15:05:04 +08:00 |
|
czm
|
5b54371cfc
|
Merge remote-tracking branch 'remotes/origin/feature/tek-system-ui' into skill
|
2020-12-28 14:36:08 +08:00 |
|
joycewsx
|
aae5223ad2
|
add industry page
|
2020-12-28 10:49:34 +08:00 |
|
思维跳跃科技
|
233061fae4
|
Merge pull request #29 from mindskip/mindskip
文档更新
|
2020-12-28 09:42:23 +08:00 |
|
思维跳跃科技
|
121b0b4dac
|
!30 文档更新
Merge pull request !30 from 思维跳跃科技/mindskip
|
2020-12-28 09:42:11 +08:00 |
|
mindskip
|
aad4a4ac13
|
文档更新
|
2020-12-28 09:40:29 +08:00 |
|
mindskip
|
fc3fc344a4
|
文档更新
|
2020-12-28 09:40:21 +08:00 |
|
思维跳跃科技
|
5195975a37
|
Merge pull request #28 from mindskip/mindskip
文档更新
|
2020-12-26 14:10:25 +08:00 |
|
思维跳跃科技
|
87824ad22f
|
!29 文档更新
Merge pull request !29 from 思维跳跃科技/mindskip
|
2020-12-26 14:08:04 +08:00 |
|
mindskip
|
250974ca58
|
文档更新
|
2020-12-26 14:05:51 +08:00 |
|
mindskip
|
6b22ad9eee
|
文档更新
|
2020-12-26 14:05:45 +08:00 |
|
mindskip
|
a4977f80b3
|
文档更新
|
2020-12-26 13:59:51 +08:00 |
|
mindskip
|
868ec844d1
|
文档更新
|
2020-12-26 13:59:42 +08:00 |
|