zhongrj
2023-04-22 eb59fe7c9f45dac117edcce495b9d3083590cd8e
refs
author zhongrj <646384940@qq.com>
Saturday, April 22, 2023 15:18 +0800
committer zhongrj <646384940@qq.com>
Saturday, April 22, 2023 15:18 +0800
commiteb59fe7c9f45dac117edcce495b9d3083590cd8e
tree 7f9d7aaf4a35135da53b2c139572e36638a8bdbe tree | zip | gz
parent 79d7c42436e87a34bb45a6e7e32b9902d22b3742 view | diff
24795c9e4a3036e5d39c0d316e8b19a6c14f6f1b view | diff
Merge remote-tracking branch 'origin/jtdev' into jtdev

# Conflicts:
# skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
6 files modified
1 files deleted
14 files added
520 ■■■■■ changed files
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/provider/AuthProvider.java 4 ●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-ops/skjcmanager-develop/src/main/java/cn/gistack/develop/DevelopApplication.java 4 ●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/libs/send-api-sdk-1.2.1.jar diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml 15 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/SmApplication.java 2 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/launch/SmLauncherServiceImpl.java 64 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttAdBaseController.java 42 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java 39 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttAdBase.java 61 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java 63 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java 15 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml 5 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java 14 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml 5 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java 14 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java 14 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttAdBaseVO.java 86 ●●●●● diff | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/application-dev.yml 26 ●●●● diff | view | raw | blame | history