parent: f0a5a2 | patch | commitdiff
cjl
2023-09-27 96d893542cc4114673baa53efaa57bb9e6abe771
refs
author cjl <276999030@qq.com>
Wednesday, September 27, 2023 17:53 +0800
committer cjl <276999030@qq.com>
Wednesday, September 27, 2023 17:53 +0800
commit96d893542cc4114673baa53efaa57bb9e6abe771
tree 794efa05fe3cfeb022f3be32ad23b976c021cffd tree | zip | gz
parent f0a5a28345ed6764ac033a585f1e6b7cbcf8d102 view | diff
dc1c8c974d9469591ead4dd1d774bbfb97a33331 view | diff 
Merge remote-tracking branch 'origin/wb' into qa

# Conflicts:
#	screen-api/src/main/resources/application-qa.yml
9 files modified
273 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/AllocationController.java 30 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/FileType.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 212 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/FileTypeUtils.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-cjl.yml 6 ●●●●● diff | view | raw | blame | history