parent: a3b34f | patch | commitdiff
cjl
2023-11-07 54beb665319b66742cdec3dffb7e298701d61582
refs
author cjl <276999030@qq.com>
Tuesday, November 7, 2023 16:45 +0800
committer cjl <276999030@qq.com>
Tuesday, November 7, 2023 16:45 +0800
commit54beb665319b66742cdec3dffb7e298701d61582
tree 19e970018a4938dc4006626eaff1ea214011d76a tree | zip | gz
parent a3b34f9f092e1aeacfe6bd4c9e80b7464dcd5912 view | diff
9bb79302a0daa72257ed107d1abab5cd357feddc view | diff 
Merge remote-tracking branch 'origin/dev' into cjl
1 files added
8 files modified
233 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/AppUserController.java 54 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/query/app/AppAllocationPushUserCond.java 49 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserService.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 73 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java 14 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/WechatUtils.java 27 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/vo/WxMssVo.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 2 ●●●●● diff | view | raw | blame | history