墨大叔
|
fca590fbd3
|
临时提交
|
2024-07-30 11:39:55 +08:00 |
|
墨大叔
|
76714ad044
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-30 10:33:23 +08:00 |
|
墨大叔
|
aa285be9b1
|
提现金额不能小于20
|
2024-07-30 10:32:36 +08:00 |
|
墨大叔
|
2eadd24576
|
提现金额不能小于20
|
2024-07-30 10:31:46 +08:00 |
|
墨大叔
|
cd26fe837f
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-29 17:38:04 +08:00 |
|
墨大叔
|
52db6e2137
|
绑定微信收款账户
|
2024-07-29 17:36:28 +08:00 |
|
墨大叔
|
7694fe894b
|
临时提交
|
2024-07-29 17:23:05 +08:00 |
|
墨大叔
|
32cfdffc06
|
Merge branch 'refs/heads/master' into dev
|
2024-07-29 14:57:44 +08:00 |
|
墨大叔
|
acdd27e5e4
|
debug
|
2024-07-29 14:57:22 +08:00 |
|
墨大叔
|
1a50637556
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
# smart-switch-service/src/main/java/com/ruoyi/ss/wxPay/service/WxPayService.java
|
2024-07-29 11:12:24 +08:00 |
|
墨大叔
|
537ef41933
|
debug
|
2024-07-29 11:09:03 +08:00 |
|
墨大叔
|
7afc60db82
|
收款账户、充值、提现申请手续费调整
|
2024-07-29 10:32:36 +08:00 |
|
墨大叔
|
b84385e313
|
收款账户
|
2024-07-28 10:41:03 +08:00 |
|
墨大叔
|
390cf406a2
|
Merge remote-tracking branch 'origin/master' into debug
|
2024-07-28 09:00:42 +08:00 |
|
墨大叔
|
d9021c7a34
|
收款人订单列表、0元下单提交
|
2024-07-27 18:41:48 +08:00 |
|
墨大叔
|
2326029f50
|
临时提交
|
2024-07-27 17:59:09 +08:00 |
|
墨大叔
|
85402f8a7d
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-27 16:58:43 +08:00 |
|
墨大叔
|
cc9be65fb1
|
提现审核
|
2024-07-27 16:57:30 +08:00 |
|
墨大叔
|
1ff3807725
|
临时提交
|
2024-07-27 14:30:08 +08:00 |
|
墨大叔
|
7fbf87ff3f
|
0元支付
|
2024-07-27 10:00:16 +08:00 |
|
墨大叔
|
9b59ab7e20
|
0元支付
|
2024-07-27 09:34:30 +08:00 |
|
墨大叔
|
14c283a011
|
新增时长订单(支付未完成)
|
2024-07-24 18:05:18 +08:00 |
|
墨大叔
|
922aedda0d
|
型号新增默认服务费值
|
2024-07-23 17:29:20 +08:00 |
|
墨大叔
|
d42b3fff75
|
新增月费功能
|
2024-07-23 16:27:23 +08:00 |
|
墨大叔
|
bb6edf05f3
|
模板修改
|
2024-07-23 11:10:22 +08:00 |
|
墨大叔
|
2f3490a53a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-23 09:12:07 +08:00 |
|
墨大叔
|
843314c5d3
|
提交
|
2024-07-23 09:11:43 +08:00 |
|
墨大叔
|
c778ca5abc
|
debug:设备操作提示优化
|
2024-07-22 17:45:59 +08:00 |
|
墨大叔
|
89993b9be5
|
提交
|
2024-07-22 17:33:01 +08:00 |
|
墨大叔
|
76f2bb2150
|
提交部署
|
2024-07-22 17:07:09 +08:00 |
|
墨大叔
|
eaa86d0ec3
|
余额变动,临时提交
|
2024-07-22 11:53:44 +08:00 |
|
墨大叔
|
8d753fbdbb
|
debug
|
2024-07-22 10:54:00 +08:00 |
|
墨大叔
|
99b0d2767b
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-07-22 10:32:14 +08:00 |
|
墨大叔
|
a05fe97eb8
|
登录bug修改
|
2024-07-22 10:23:48 +08:00 |
|
墨大叔
|
49f1c50460
|
套餐排序,暂未测试
|
2024-07-22 10:19:40 +08:00 |
|
墨大叔
|
a44c907099
|
前台用户账号密码登录
|
2024-07-20 14:58:55 +08:00 |
|
墨大叔
|
608ff95255
|
添加套餐清空
|
2024-07-19 18:00:29 +08:00 |
|
墨大叔
|
b969fa2a52
|
秘钥缓存、WIFI、设备类名称重构
|
2024-07-19 17:48:58 +08:00 |
|
墨大叔
|
b3eb9b8313
|
debug秘钥
|
2024-07-18 18:52:12 +08:00 |
|
墨大叔
|
49baa39cd1
|
密钥对接口完善
|
2024-07-18 18:17:35 +08:00 |
|
墨大叔
|
d8b9992b23
|
BUG修复:支付、时长、套餐
|
2024-07-18 17:40:30 +08:00 |
|
墨大叔
|
bd428814a3
|
套餐时间修改
|
2024-07-17 13:47:04 +08:00 |
|
墨大叔
|
11fda9f59e
|
服务费调整、支付BUG修改
|
2024-07-16 14:44:00 +08:00 |
|
墨大叔
|
099249122f
|
修复正在使用中的设备问题
|
2024-07-15 17:56:58 +08:00 |
|
墨大叔
|
8a0a9475ad
|
移除套餐模板(无用模块)
|
2024-07-15 16:06:46 +08:00 |
|
墨大叔
|
b48c4dcbc9
|
提交测试环境
|
2024-07-15 15:26:48 +08:00 |
|
墨大叔
|
1f6d8ff965
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-12 17:54:31 +08:00 |
|
墨大叔
|
2296efa998
|
订单套餐时间(暂未测试)
|
2024-07-12 17:54:14 +08:00 |
|
墨大叔
|
94edae1752
|
部署
|
2024-07-12 17:53:39 +08:00 |
|
墨大叔
|
a495de04fc
|
部署
|
2024-07-10 17:57:39 +08:00 |
|