磷叶
|
ad7610b9f0
|
debug:数据点获取
|
2024-11-12 09:53:45 +08:00 |
|
墨大叔
|
4cc8ab112c
|
临时提交
|
2024-10-14 13:29:54 +08:00 |
|
墨大叔
|
9f7aadd2c3
|
恢复设备总用电量
|
2024-10-07 09:25:18 +08:00 |
|
墨大叔
|
903884cecb
|
设备双MAC在线状态
|
2024-10-06 18:03:03 +08:00 |
|
墨大叔
|
c38bcae036
|
设备余额恢复
|
2024-10-06 13:32:53 +08:00 |
|
墨大叔
|
beb93dad38
|
临时提交：语音版
|
2024-09-30 17:54:21 +08:00 |
|
墨大叔
|
16e2ead7e6
|
细节优化
|
2024-09-28 17:14:43 +08:00 |
|
墨大叔
|
b8d3f2fc7c
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/domain/entity/SmUser.java
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/core/redis/enums/RedisLockKey.java
# smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/enums/UserType.java
# smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java
# smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
# smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBill.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/vo/TransactionBillVO.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/RechargePayHandler.java
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/ss/user/mapper/SmUserMapper.xml
# smart-switch-service/src/main/java/com/ruoyi/ss/user/service/ISmUserService.java
# smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/SmUserServiceImpl.java
|
2024-09-26 09:43:34 +08:00 |
|
墨大叔
|
e2b9f18a21
|
双模设备、用户密码、蓝牙设备充值、支付回调优化
|
2024-09-25 18:30:23 +08:00 |
|
墨大叔
|
ed1df8462c
|
临时提交
|
2024-09-13 15:09:35 +08:00 |
|
墨大叔
|
6b1f38f07a
|
套餐修改
|
2024-08-16 22:20:53 +08:00 |
|
墨大叔
|
50741928a5
|
套餐、订单修改
|
2024-08-15 21:23:07 +08:00 |
|
墨大叔
|
6ef84a9fe3
|
设备型号配置产品ID
|
2024-08-12 20:55:59 +08:00 |
|
墨大叔
|
66b948e120
|
API收费及各种优化
|
2024-08-08 17:54:35 +08:00 |
|
墨大叔
|
b969fa2a52
|
秘钥缓存、WIFI、设备类名称重构
|
2024-07-19 17:48:58 +08:00 |
|
墨大叔
|
bd428814a3
|
套餐时间修改
|
2024-07-17 13:47:04 +08:00 |
|
墨大叔
|
b48c4dcbc9
|
提交测试环境
|
2024-07-15 15:26:48 +08:00 |
|
墨大叔
|
2296efa998
|
订单套餐时间（暂未测试）
|
2024-07-12 17:54:14 +08:00 |
|
墨大叔
|
1a2128642f
|
debug
|
2024-07-09 11:17:20 +08:00 |
|
墨大叔
|
8ebe489761
|
debug + 绑定操作修改
|
2024-06-14 17:12:03 +08:00 |
|
墨大叔
|
5162eb39c2
|
debug
|
2024-05-23 09:31:16 +08:00 |
|
墨大叔
|
5ee530e494
|
异常上报、SN绑定、设备推送
|
2024-05-06 18:06:58 +08:00 |
|
墨大叔
|
285897d58d
|
项目结构重构
|
2024-04-23 11:19:24 +08:00 |
|