forked from moral

parent: 2a4a9e | patch | commitdiff
cjl
2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07
refs
author cjl <276999030@qq.com>
Friday, October 20, 2023 14:51 +0800
committer cjl <276999030@qq.com>
Friday, October 20, 2023 14:51 +0800
commita3eaa78c6d839b640c728f4c7d8eb27732627b07
tree dd6cb1a962d0dc7f62c7a40e603ee73cef302636 tree | zip | gz
parent 2a4a9ef52b0d76efb9712fd8d4268f658546f99f view | diff
58e6dec8c583778714bb1447755f9ffc46b0c5ec view | diff 
Merge remote-tracking branch 'origin/dev' into qa

# Conflicts:
#	screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
9 files added
17 files modified
906 ■■■■■ changed files
screen-api/pom.xml 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AllocationController.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java 63 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AppUserController.java 64 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/AppUser.java 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/User.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/AllocationMapper.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/AppUserMapper.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/AppAllocationStateEnum.java 59 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/AppUserCond.java 31 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java 79 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/AllocationService.java 26 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserService.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 145 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 167 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java 136 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/WechatUtils.java 49 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-cjl.yml 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-local.yml 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-qa.yml 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationMapper.xml 1 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/Constants.java 7 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/util/TokenUtils.java 21 ●●●●● diff | view | raw | blame | history