Commit Graph

91 Commits

Author SHA1 Message Date
SjS
dd2aef808e 广告校验,前端补充,bug修复 2025-04-22 11:50:16 +08:00
SjS
ffe2d1b3bb 新增协议代码修改,代码风格规范 2025-04-21 19:13:08 +08:00
磷叶
ff5f29cf0b debug 2025-04-21 18:27:12 +08:00
SjS
ffe409d63f 故障审核和广告审核完善 2025-04-21 18:19:00 +08:00
SjS
b8db402ede 客服完善 2025-04-21 10:58:03 +08:00
磷叶
a19a7a91a1 debug 2025-04-19 19:50:50 +08:00
磷叶
3b2bfd50d5 debug 2025-04-19 19:38:59 +08:00
磷叶
bef43caee5 debug 2025-04-19 17:44:49 +08:00
磷叶
c83307cb6d debug 2025-04-19 16:04:47 +08:00
磷叶
79dc7fde0f 更新 2025-04-16 17:53:37 +08:00
磷叶
cc628ffc94 短信通知 2025-04-16 15:00:52 +08:00
磷叶
6adb8fd44d Merge remote-tracking branch 'origin/master' 2025-04-15 18:16:35 +08:00
磷叶
21eb6a6a82 更新 2025-04-15 18:16:16 +08:00
SjS
c74cbd51b5 Merge remote-tracking branch 'origin/master' 2025-04-15 09:14:10 +08:00
SjS
3e66ad9d16 招商加盟,客服完善 2025-04-15 09:13:38 +08:00
磷叶
cb28a098ef 更新 2025-04-14 18:09:00 +08:00
磷叶
06877d967c 更新 2025-04-14 18:07:16 +08:00
SjS
1d9870ac6f 广告模块修改 2025-04-14 17:02:34 +08:00
SjS
007e4eed3a Merge remote-tracking branch 'origin/master' 2025-04-12 16:52:01 +08:00
SjS
052ae1e380 故障新增运营区 2025-04-12 16:51:48 +08:00
磷叶
bc7eeb87e6 Merge remote-tracking branch 'origin/master' 2025-04-12 16:15:57 +08:00
磷叶
95aedfeb9c ws、套餐金额计算 2025-04-12 16:15:50 +08:00
SjS
60b9c7806c 故障申報bug修改 2025-04-12 09:14:33 +08:00
SjS
fe71a0d180 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/mapper/HardwareVersionMapper.java
#	ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/service/HardwareVersionService.java
#	ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/service/impl/HardwareVersionServiceImpl.java
2025-04-11 18:46:20 +08:00
SjS
490c15ad18 硬件版本数量计算修正 2025-04-11 18:41:51 +08:00
磷叶
62cef22f1f 提交更新 2025-04-11 18:08:08 +08:00
磷叶
6336f41a79 定位区域判断更新,更加准确 2025-04-11 15:35:25 +08:00
磷叶
578adc465c 定位区域判断更新,更加准确 2025-04-10 19:56:50 +08:00
磷叶
8534e08033 公告匿名 2025-04-10 16:47:41 +08:00
磷叶
ae65d4a90f 订单支付 2025-04-10 16:46:29 +08:00
SjS
0c88acaa03 硬件版本各数量计算 2025-04-10 15:02:19 +08:00
磷叶
08d8520aee debug:设备状态问题 2025-04-10 14:06:52 +08:00
磷叶
1622cac9a9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java
2025-04-10 11:29:41 +08:00
磷叶
1817fbab02 数据统计 2025-04-10 11:29:06 +08:00
SjS
7b96b7f30e 广告功能和协议完善 2025-04-09 20:36:35 +08:00
SjS
7fbb4c8349 协议前后端完善 2025-04-09 10:03:35 +08:00
SjS
27b4858aa7 Merge remote-tracking branch 'origin/master' 2025-04-08 16:32:10 +08:00
SjS
dd429809ca 新增广告bug修改 2025-04-08 16:31:58 +08:00
磷叶
273b539859 数据统计 2025-04-08 16:18:12 +08:00
SjS
8098ebc3da 招商加盟 2025-04-08 16:04:36 +08:00
磷叶
aa7e39b84f Merge remote-tracking branch 'origin/wjh' 2025-04-08 08:46:47 +08:00
磷叶
2b513cdf11 提现等 2025-04-08 08:46:02 +08:00
SjS
2383216967 广告、协议、软硬件功能模块 2025-04-07 20:36:04 +08:00
磷叶
fe2c97cfae 提现等 2025-04-07 16:20:50 +08:00
磷叶
8594e9a7fc Merge remote-tracking branch 'origin/master' 2025-04-06 18:20:05 +08:00
磷叶
e400663db9 数据统计等 2025-04-06 18:19:58 +08:00
SjS
e390702eed Merge remote-tracking branch 'origin/master' 2025-04-04 18:26:24 +08:00
SjS
ab33dc9e84 客服相关功能 2025-04-04 18:22:43 +08:00
磷叶
493c346d9b 数据统计等 2025-04-04 18:13:01 +08:00
磷叶
ed3173eea9 Merge remote-tracking branch 'origin/master' 2025-04-03 20:55:25 +08:00