xc-video.git - Gitblit

xiaoyong931011

2021-12-22 db755501635521cf10bfe89ecd7ee977f384b968

refs
author	xiaoyong931011 <15274802129@163.com>
	Wednesday, December 22, 2021 15:02 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Wednesday, December 22, 2021 15:02 +0800
commit	db755501635521cf10bfe89ecd7ee977f384b968
tree	bf7e2860b9fedf90d78709ce4c6e678df0da0de3 tree \| zip \| gz
parent	6c920885a9bc407f2f05e204ae9769631c4c80e7 view \| diff f7410364109ebb426a5e0184683a10fb1efdd0a0 view \| diff

Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

5 files modified

	src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/application-dev.yml	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/video/VideoMasterInfoMapper.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/video/video/video-list.html	52 ●●●●● diff \| view \| raw \| blame \| history