Commit Graph

24 Commits

Author SHA1 Message Date
磷叶
e9c06867d6 店铺报表修改 2025-02-01 20:35:46 +08:00
磷叶
047b9709e7 提交更新会员校验 2025-01-23 15:50:13 +08:00
磷叶
bd9dd194dc 提交 2025-01-15 18:01:10 +08:00
磷叶
4264bcfd3e 公告、文章优化 2025-01-15 17:14:48 +08:00
磷叶
fc10f9ff1e 提交 2025-01-14 18:08:24 +08:00
磷叶
b4aa567ad4 提交 2025-01-09 18:09:16 +08:00
磷叶
2378e99c3b 提交 2025-01-07 18:22:12 +08:00
磷叶
66565eda94 支付宝登录、获取支付宝手机号、远程配网 2024-12-04 11:22:46 +08:00
墨大叔
32ed751e3d Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	smart-switch-ruoyi/smart-switch-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
2024-10-14 08:36:19 +08:00
墨大叔
c1aa9ac39d 10-12更新:
1.设备充值debug
2.新增登录手机号配置
2024-10-12 12:25:20 +08:00
墨大叔
7550ad1ac7 修改手机号(一半) 2024-10-11 17:06:41 +08:00
墨大叔
c35a60695c 商户订单统计 2024-10-08 16:05:28 +08:00
墨大叔
a08bb65830 临时提交 2024-09-26 11:09:25 +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
墨大叔
f37bc4779a 提现风控 2024-09-21 19:28:59 +08:00
墨大叔
c9859e4b78 套餐低功率关闭 2024-09-19 16:10:04 +08:00
墨大叔
667d021142 临时提交 2024-09-15 17:04:26 +08:00
墨大叔
7563bde2bc 充值最低手续费 2024-09-09 15:40:06 +08:00
墨大叔
5426294462 提现免审核额度 2024-09-04 14:27:09 +08:00
墨大叔
7b5692787b 套餐配置 2024-08-13 17:01:49 +08:00
墨大叔
7694fe894b 临时提交 2024-07-29 17:23:05 +08:00
墨大叔
bd428814a3 套餐时间修改 2024-07-17 13:47:04 +08:00
墨大叔
c8d55e7df9 故障上报、订单、商户合作申请 2024-05-05 17:10:04 +08:00
墨大叔
285897d58d 项目结构重构 2024-04-23 11:19:24 +08:00