java/mx_charging_pile.git

明星电力充电桩

Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-08 516a44e6c32811d47668c5106ecef8154e86c8cc

refs
用户	Pu Zhibing <393733352@qq.com>
	星期二, 十月 8, 2024 13:43 +0800
提交者	Pu Zhibing <393733352@qq.com>
	星期二, 十月 8, 2024 13:43 +0800
提交	516a44e6c32811d47668c5106ecef8154e86c8cc
目录	a4f603b24eb369cdf08d0a36e1c18464d9c73ffa 目录 \| zip \| gz
parent	353046569e34b470aeef52c14bc60dc147660c46 查看 \| 对比 1f1cf6f0288863f59051bd506243eb99a985bee9 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java

12个文件已添加

7个文件已修改

	ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDelivery.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/QrCodeDeliveryReply.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/SecurityDetection.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/constant/SendTagConstant.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/controller/SendMessageController.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/MessageUtil.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/QrCodeDeliveryReplyService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/QrCodeDeliveryService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/SecurityDetectionService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/QrCodeDeliveryReplyServiceImpl.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/QrCodeDeliveryServiceImpl.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/SecurityDetectionServiceImpl.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryMessage.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/QrCodeDeliveryReplyMessage.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/SecurityDetectionMessage.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/EnhanceProduce.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史