Commit Graph

37 Commits

Author SHA1 Message Date
康家辉 776feb9fb6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
2022-05-05 19:22:20 +08:00
康家辉 66ea27faee 添加错误码和注释 2022-05-05 19:21:33 +08:00
康家辉 de468764b4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
2022-05-05 19:00:42 +08:00
康家辉 45a3e4a3a9 添加错误码和注释 2022-05-05 18:59:29 +08:00
ladeng07 7fa3281a5f 增加了util里的get_error_msg 2022-05-05 18:57:35 +08:00
ladeng07 5ca57df452 重构了app 2022-05-05 18:32:19 +08:00
康家辉 19440fe0e2 修改了部门详情的model,
添加了对数据库数据输出前的格式验证
2022-04-30 22:37:50 +08:00
康家辉 14a75d3fdd 完善了一下serializers 2022-04-29 20:03:28 +08:00
ladeng07 b6a66a1457 第一次合并+上线
修改了history路由
2022-04-27 21:56:01 +08:00
ladeng07 d5f618351a Merge remote-tracking branch 'gitee/master'
# Conflicts:
#	.idea/misc.xml
#	.idea/workspace.xml
2022-04-26 00:24:28 +08:00
康家辉 e455e1aabc 1 2022-04-24 17:58:03 +08:00
康家辉 7d06e64645 1 2022-04-24 17:56:23 +08:00
ladeng07 49c0c3dabc Merge remote-tracking branch 'remotes/gitee/enroll'
# Conflicts:
#	ITShowPlatform/settings.py
#	ITShowPlatform/urls.py
2022-04-24 15:24:19 +08:00
ladeng07 a2a794cca4 修改+合并前的提交 2022-04-24 15:23:24 +08:00
ygm1881 177441d2d1 enroll app修改 2022-04-21 22:07:26 +08:00
ygm1881 f82e77e932 enroll app修改 2022-04-21 21:47:42 +08:00
ygm1881 16b2e3cf8e enroll app修改 2022-04-21 21:39:13 +08:00
ygm1881 1c8a148c84 enroll 2022-04-17 22:41:55 +08:00
ygm1881 7015fd799d enroll 2022-04-17 22:04:32 +08:00
ygm1881 2e5416aa4d enroll 2022-04-17 19:09:32 +08:00
ygm1881 b14a69e312 enroll 2022-04-17 18:33:48 +08:00
ladeng07 0178776c12 fix 2022-04-17 17:31:54 +08:00
ladeng07 83815ec267 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/workspace.xml
2022-04-17 17:25:07 +08:00
康家辉 2a0bae7af2 1 2022-04-17 17:22:44 +08:00
ladeng07 d07fd3c977 55 2022-04-17 17:20:45 +08:00
ladeng07 dc8cd012a4 Delete it.iml 2022-04-17 16:59:22 +08:00
ladeng07 273f9b5bcf Delete IT_Show.iml 2022-04-17 16:59:13 +08:00
ladeng07 db21bf77ac 小改 2022-04-17 16:58:21 +08:00
ladeng07 a8f1cd8ef2 终于合并了55555 2022-04-17 16:08:27 +08:00
ladeng07 b2c34886a4 Initial commit 2022-04-17 15:46:21 +08:00
shineahead febe17d539 弹幕接口和历史接口 2022-04-17 15:44:54 +08:00
mgy1881 3c0c328fae Update settings.py
null
2022-04-17 15:44:50 +08:00
mgy1881 a5815e5ccb mgy 2022-04-17 15:44:50 +08:00
ygm1881 fcf592258a mgy 2022-04-17 15:44:50 +08:00
ygm1881 3773b043f4 4.16night 2022-04-17 15:44:50 +08:00
ygm1881 d8d21473a1 save 2022-04-17 15:44:34 +08:00
ygm1881 f0389a8c8e enroll 2022-04-17 15:35:18 +08:00