Commit Graph

133 Commits

Author SHA1 Message Date
SjS
ae650c5ddc 故障申报细节修正 2025-04-12 09:17:28 +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
磷叶
d4141faac0 Merge remote-tracking branch 'origin/master' 2025-04-10 16:47:20 +08:00
磷叶
ae65d4a90f 订单支付 2025-04-10 16:46:29 +08:00
SjS
51d1a8d7dd 文章修正 2025-04-10 16:46:12 +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
de117d0d65 广告和协议功能 2025-04-10 10:46:28 +08:00
SjS
7b96b7f30e 广告功能和协议完善 2025-04-09 20:36:35 +08:00
SjS
7fbb4c8349 协议前后端完善 2025-04-09 10:03:35 +08:00
SjS
6e34237028 协议相关、文章分类bug修改、文章逻辑完善、前端界面完善 2025-04-08 20:31:05 +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
SjS
3b68b1a111 Merge remote-tracking branch 'origin/master' 2025-04-08 08:53:08 +08:00
SjS
e3946399d4 协议完善 2025-04-08 08:52:53 +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
磷叶
af7c91e57b 车辆轨迹 2025-04-03 20:53:52 +08:00
SjS
66584feb4f 删除分类完善 2025-04-03 20:52:53 +08:00
SjS
a98e0e86a6 客服相关功能 2025-04-03 19:56:03 +08:00
磷叶
045666041b 订单多车辆 2025-04-02 21:02:17 +08:00
SjS
cc0d20ddc1 客服相关功能 2025-04-02 20:06:50 +08:00
磷叶
21f2a75713 订单多车辆 2025-04-02 17:24:20 +08:00
SjS
60caeef889 故障申报前后台实现权限校验 2025-04-02 13:17:28 +08:00
SjS
8144e4019e 故障申报前台最终完善 2025-04-02 09:28:02 +08:00
SjS
52502bfa15 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
2025-04-02 09:12:33 +08:00
磷叶
3d43715051 Merge remote-tracking branch 'origin/master' 2025-04-01 21:30:57 +08:00
磷叶
e0afb38346 订单多车辆 2025-04-01 21:30:47 +08:00
SjS
77d3a20530 待做权限隔离 2025-04-01 18:17:31 +08:00
SjS
2beddf0e90 故障申报更新,广告,系统公告 2025-04-01 18:02:44 +08:00
SjS
03c52195d6 故障申报更新 2025-03-31 08:48:38 +08:00
sen
45a12d498f 故障 2025-03-31 01:43:43 +08:00