parent: 735a26 | patch | commitdiff
tangzy
2021-08-09 3413151b3bc4894110a34504a2359a528eb4aae9
refs
author tangzy <tangzy123456>
Monday, August 9, 2021 15:57 +0800
committer tangzy <tangzy123456>
Monday, August 9, 2021 15:57 +0800
commit3413151b3bc4894110a34504a2359a528eb4aae9
tree 6a0dfef3a0d030987d5ebfe1be88b1aa2c6e1a59 tree | zip | gz
parent 735a26759084d5fca25f9ad48c2f3f1299246854 view | diff
c1a209367f08974e762443a58a1904dc727b08ed view | diff 
Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

 Conflicts:
	src/main/java/org/springblade/modules/desk/controller/NoticeController.java
	src/main/java/org/springblade/modules/information/controller/InformationController.java
	src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
	src/main/java/org/springblade/modules/training/controller/TrainExamController.java
	src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
14 files modified
1 files added
216 ■■■■■ changed files
src/main/java/org/springblade/modules/desk/controller/NoticeController.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 35 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/information/service/IInformationService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/information/vo/InformationVO.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/DictBizController.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/DictBizMapper.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml 32 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/node/TreeNode.java 38 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IDictBizService.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/training/controller/TrainExamController.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java 7 ●●●●● diff | view | raw | blame | history