Commit Graph

533 Commits

Author SHA1 Message Date
马三炮 b63bde9f57 问题修复 2025-03-14 17:50:26 +08:00
mashuai ef8fd59d8b 大屏 2025-03-14 17:24:25 +08:00
mashuai 4ea5a3686e 大屏 2025-03-12 17:42:45 +08:00
mashuai 0d53f44ee7 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-03-12 14:52:53 +08:00
mashuai 92f51eb9c0 通知公告 2025-03-12 14:52:48 +08:00
hongchao 2bd60efa21 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-03-11 18:21:38 +08:00
hongchao c821ec5051 数量装备流程 2025-03-11 18:21:24 +08:00
mashuai f2e39fd91a 优化 2025-03-11 16:23:51 +08:00
mashuai a87afeef23 优化 2025-03-11 15:05:03 +08:00
mashuai e61f3a5392 文件名优化 2025-03-11 10:59:40 +08:00
hongchao fddfd688a7 bug 修复 2025-03-10 16:57:28 +08:00
mashuai 9203277953 功能需求优化 2025-03-10 10:55:38 +08:00
mashuai e002af3c3a 功能需求优化 2025-03-10 10:48:40 +08:00
syruan a8a64cc426 新增企业专区接口,合同修改 2025-02-28 13:30:24 +08:00
syruan 5c87a37002 省公司短信平台 2025-02-26 18:11:52 +08:00
mashuai 6f3f7d9c32 功能需求优化 2025-02-26 14:59:21 +08:00
mashuai aad1c1e315 功能需求优化 2025-02-26 14:49:13 +08:00
mashuai 243465b36e 功能需求优化 2025-02-26 14:44:48 +08:00
syruan 7cd842073e 订单短信发送1 2025-02-25 17:10:55 +08:00
mashuai 50b984ba3b 功能需求优化 2025-02-25 16:50:16 +08:00
mashuai e45a54511d 功能需求优化 2025-02-25 15:05:00 +08:00
syruan 94c04684dc 订单短信发送 2025-02-25 13:54:46 +08:00
mashuai 249cc4553c Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-02-25 13:52:19 +08:00
mashuai 1c18b649f9 功能需求优化 2025-02-25 13:52:11 +08:00
syruan c62c65e34f 订单短信发送 2025-02-24 18:27:46 +08:00
mashuai ff2d52126e 功能需求优化 2025-02-24 17:59:31 +08:00
mashuai f2b250e0b1 功能需求优化 2025-02-24 16:36:11 +08:00
syruan 21f8103961 优化问题 2025-02-24 15:49:21 +08:00
liang.chao 3827dad74a Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
2025-02-21 18:44:19 +08:00
liang.chao 15515e28ee 合同协议功能开发 2025-02-21 18:43:12 +08:00
mashuai f194335742 功能需求优化 2025-02-21 17:33:09 +08:00
haozq a299791d26 Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
2025-02-21 17:26:33 +08:00
haozq bab5c75074 订单号查询 2025-02-21 17:26:07 +08:00
mashuai e44616fc3f 功能需求优化 2025-02-21 17:16:55 +08:00
bonus f6bbc9d2f5 消息未读数开发 2025-02-14 09:24:40 +08:00
sxu 7f1e6de5f0 Merge branch 'master' into ah-simple 2025-01-23 10:16:41 +08:00
sxu 37caac54fc 代办优化 2025-01-23 10:15:35 +08:00
sxu 65afc2269d Merge branch 'master' into ah-simple 2025-01-23 10:01:27 +08:00
sxu dc217d8ac4 代办优化 2025-01-22 15:03:52 +08:00
sxu 6391be0117 Revert "代办优化"
This reverts commit e4f42a6456.
2025-01-22 13:53:39 +08:00
sxu e4f42a6456 代办优化 2025-01-22 09:57:13 +08:00
sxu 115de905e5 代办优化 2025-01-22 09:46:05 +08:00
liang.chao 670411c42d 消息已读功能修改 2025-01-21 18:26:50 +08:00
sxu c718321ee3 Merge branch 'master' into ah-simple 2025-01-16 11:00:21 +08:00
sxu 6fc53f04cc Revert "slideshow"
This reverts commit 69795a9617.
2025-01-16 10:59:56 +08:00
sxu be9c1bbb09 slideshow 2025-01-16 10:58:49 +08:00
sxu 69795a9617 slideshow 2025-01-16 09:42:07 +08:00
sxu 851297436b Merge branch 'master' into ah-simple 2025-01-15 09:24:11 +08:00
sxu 40e5c73bcd slideshow 2025-01-15 09:20:24 +08:00
sxu 785245727e Merge branch 'master' into ah-simple 2025-01-10 12:06:13 +08:00
sxu 33c5a13100 修复个人中心电话显示问题 2025-01-10 12:05:03 +08:00
sxu fa3a396d90 安徽简化版 2025-01-10 10:18:11 +08:00
sxu ff0a813807 大屏bug 2025-01-07 19:04:01 +08:00
sxu e1df8bf961 大屏bug 2025-01-07 18:10:59 +08:00
sxu 44f5f0c510 大屏bug 2025-01-07 17:48:26 +08:00
sxu 93996d1853 大屏bug 2025-01-07 17:40:32 +08:00
sxu 11534b3436 大屏bug 2025-01-07 16:04:59 +08:00
sxu 350150ac89 大屏bug 2025-01-07 15:41:05 +08:00
sxu a80aae8836 大屏:出租装备分析 2025-01-07 14:45:22 +08:00
sxu a94d150c5a 大屏:租赁需求分析 2025-01-07 14:30:52 +08:00
sxu 8c5a13fa16 大屏:租赁跟踪 2025-01-07 14:20:19 +08:00
sxu 9fa708625b 大屏:装备共享排名 2025-01-07 13:29:22 +08:00
sxu 16efe3dbac 大屏:装备租赁互联 2025-01-06 17:59:37 +08:00
sxu b517031534 大屏:出租装备分析 2025-01-06 17:15:39 +08:00
sxu c7dde73e4f 大屏:闲置装备分析 2025-01-06 16:30:17 +08:00
sxu 8ce8e73ed3 需求详情 2025-01-02 18:08:33 +08:00
sxu 27b5de0b91 需求详情 2025-01-02 17:41:51 +08:00
sxu c16f9953ac 订单消息 2025-01-02 16:18:32 +08:00
sxu 9dc9a112d9 订单消息 2025-01-02 16:00:19 +08:00
sxu a9df4f47cf 订单消息 2025-01-02 15:56:27 +08:00
sxu 3ed2059cde 订单消息 2025-01-02 15:44:46 +08:00
sxu 2b548896f0 大屏装备利用率计算 2025-01-02 14:30:31 +08:00
sxu 921dc6d9b9 分页测试 2024-12-31 17:01:01 +08:00
sxu cdb8193a75 装备上架按类型统计 2024-12-31 15:03:11 +08:00
sxu 2a15873c62 装备需求统计 2024-12-31 14:29:25 +08:00
sxu cde70380a4 装备租赁统计 2024-12-31 13:35:51 +08:00
sxu f2e848c0e4 装备租赁统计 2024-12-31 13:20:07 +08:00
sxu 9b007d4a0a 装备上架统计 2024-12-31 11:15:57 +08:00
sxu 9db2dd3c55 装备总数和上架总数 2024-12-31 10:21:35 +08:00
sxu ccf2128076 消息类型 2024-12-31 10:04:43 +08:00
sxu 29b7988f83 搜索 2024-12-30 17:45:11 +08:00
liang.chao 71634e3ca3 快捷回复查询bug修改 2024-12-30 17:19:26 +08:00
sxu c8db2df18c Merge remote-tracking branch 'origin/master' 2024-12-27 18:59:24 +08:00
liang.chao 3e8befc805 显示提示 2024-12-27 16:49:34 +08:00
liang.chao f72c6fc29d 安全证书查询bug修改 2024-12-27 16:16:43 +08:00
liang.chao 7cc2b1410c 相关功能优化 2024-12-27 15:38:14 +08:00
sxu f30e571a10 todolist get order by code 2024-12-27 14:48:04 +08:00
sxu 44352c5b68 todolist taskStatus 2024-12-27 13:55:03 +08:00
sxu a521cf21a3 Merge remote-tracking branch 'origin/master' 2024-12-27 13:53:26 +08:00
sxu ea37a7df12 统计订单数,按角色 2024-12-27 13:51:46 +08:00
liang.chao 0352bc784c 装备详情质检证书取最新质检报告 2024-12-27 10:13:50 +08:00
sxu b958763adf 无检测报告报错 2024-12-26 19:10:55 +08:00
liang.chao 48ad3ffeb4 Merge remote-tracking branch 'origin/master' 2024-12-26 18:13:23 +08:00
liang.chao 3111e81428 安全证书质检管理 维修保养、接单、审核、驳回发送消息 2024-12-26 18:13:12 +08:00
sxu ab69f00a80 Merge remote-tracking branch 'origin/master' 2024-12-26 18:11:28 +08:00
liang.chao c8cba86a8c 安全证书质检管理 维修保养、接单、审核、驳回发送消息 2024-12-26 18:09:48 +08:00
liang.chao b9721cf32b 安全证书质检管理 维修保养、接单、审核、驳回发送消息 2024-12-26 18:09:29 +08:00
sxu e6ae06d412 购物车批量删除 2024-12-26 18:09:09 +08:00
liang.chao 95de8db2da 消息管理流程逻辑修复 装备质检以及接单存放消息功能 2024-12-26 10:36:27 +08:00
sxu 4431d624db 消息 2024-12-25 19:03:28 +08:00