parent: 2c9538 | patch | commitdiff
kaiyu
2021-03-18 333065f8d9b599b048668a0686ba2ee58944b0e4
refs
author kaiyu <404897439@qq.com>
Thursday, March 18, 2021 11:26 +0800
committer kaiyu <404897439@qq.com>
Thursday, March 18, 2021 11:26 +0800
commit333065f8d9b599b048668a0686ba2ee58944b0e4
tree 22e14bd4e6c31b83a80d67299f8461f170065d2d tree | zip | gz
parent 2c953876eab1622e2598a3d1ab92ae29e1d88fe5 view | diff
511fbc6392d46828284bd72b47966ef217893275 view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
1 files deleted
1 files added
10 files modified
351 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/LoginController.java 113 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UserController.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/WebController.java 82 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/User.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/UserMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserService.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 94 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/GroupMapper.xml 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/UserMapper.xml 30 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java 3 ●●●●● diff | view | raw | blame | history