hbwri/skjcmanager.git

湖北水库项目

guoshilong

2023-07-06 390eb925034c3f6dea83fc7ce2378ea40a93053d

refs
author	guoshilong <123456>
	Thursday, July 6, 2023 11:10 +0800
committer	guoshilong <123456>
	Thursday, July 6, 2023 11:10 +0800
commit	390eb925034c3f6dea83fc7ce2378ea40a93053d
tree	8351a7c26df44a333a97e0ee653f29c15ae0fce8 tree \| zip \| gz
parent	f5a4bae239e86c489d85474a9678be82c1d0f739 view \| diff 89803bcf285959132e432a9a3a45b3fa6c8bbd81 view \| diff

Merge remote-tracking branch 'origin/jtdev' into jtdev

# Conflicts:
#	data/applogs/xxl-job/xxl-job-admin.log

4 files modified

1 files deleted

1 files added

	data/applogs/xxl-job/xxl-job-admin.log	63052 ●●●●● diff \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java	18 ●●●●● diff \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java	1 ●●●●● diff \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java	8 ●●●●● diff \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/AsyncSmsService.java	28 ●●●●● diff \| view \| raw \| blame \| history