Commit Graph

72 Commits (fe6f468d38f3b9e2d86b2ce4afede72ea8cc6c81)
 

Author SHA1 Message Date
whb fe6f468d38 完善最后需求
wanghb 0fa5cac2cc 差一个过滤器
wanghb 623d10c5e0 第一次提交
whb 88ffcb9ecf 细节完善
whb 9cbb117623 完善
whb 93c1d6fc32 目录归属修改
whb c81052b0b9 目录归属修改
@t2652009480 9ed9c64bf5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/templates/layui-v2.6.8/index.html
@t2652009480 fdef4e5429 添加目录的完成
whb bde8f15d63 目录归属修改
whb 15ac56a48a 目录归属修改
whb 0c564c6066 Merge remote-tracking branch 'origin/master'
whb 40ab2bd593 目录归属修改
@t2652009480 2f084ecc3d Merge remote-tracking branch 'origin/master'
@t2652009480 0c5de007b7 添加目录的完成
whb 1ba821dfda
删除文件 README.md
whb b9d2410050 目录归属修改
whb ab89deb409
合并分支
Merge pull request  from whb/master2
whb f4ccd50a55 Merge branch 'master' of gitee.com:Qx90193/zhiyun into master2
Signed-off-by: whb <17803890193@163.com>
@t2652009480 1a568102c5 客户端
whb b18a4e458f 添加目录的完成
whb c93d3be8e5 first commit
whb 578aef8fb0 添加目录的完成
whb a4e58d6747 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/templates/layui-v2.6.8/courseList.html
#	src/main/resources/templates/layui-v2.6.8/inviteList.html
whb 10da020885 添加目录的完成
whb a7610db7cf qianduan
whb 1801a069f4 Merge branch 'version1.0' of https://gitee.com/Qx90193/zhiyun
# Conflicts:
#	src/main/java/com/zhiyun/zhiyun03/client/ClientBelowPanel.java
#	src/main/java/com/zhiyun/zhiyun03/client/ClientFrame.java
whb 71755c09a0 前端添加目录和课程,编辑
whb c69343d6bb 前端添加目录和课程,编辑
@t2652009480 83617994c8 客户端
@t2652009480 ba32ec3549 客户端
@t2652009480 93e1f17dfd 客户端
@t2652009480 79f55ee5ef Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java
@t2652009480 55dc7162bd 客户端
whb 4a110e0919 前端添加目录和课程,编辑
whb f6dfd2c3d9 前端添加目录和课程,编辑
whb e08e2d6917 前端添加目录和课程,编辑
whb 95c2766e64 前端添加目录和课程,编辑
whb f078503ecf 登录
whb 8af2505255 前端添加目录和课程,编辑
whb c093d7c323 Merge branch 'master' of https://gitee.com/Qx90193/zhiyun
whb 80ac6089e0 1
whb 697be9824a 后台管理页面删除功能
whb 002b7b6d4a
合并分支
Merge pull request  from whb/master1
whb 57c711f104 Merge branch 'master' of gitee.com:Qx90193/zhiyun into master1
Signed-off-by: whb <17803890193@163.com>
@t2652009480 75b628dd49 应用中心
whb ee6d55533e
合并分支
Merge pull request  from whb/version1.0
wanghb 2e072078b3 添加后端管理页面
@t2652009480 f7769ea628 Merge remote-tracking branch 'origin/master'
@t2652009480 27a6fa39f9 应用中心