Commit Graph

589 Commits

Author SHA1 Message Date
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
bonus 9e477770b6 Merge remote-tracking branch 'origin/ah-simple' into ah-simple 2025-02-24 18:34:08 +08:00
syruan c62c65e34f 订单短信发送 2025-02-24 18:27:46 +08:00
mashuai ff2d52126e 功能需求优化 2025-02-24 17:59:31 +08:00
bonus 8e18acd1fc Merge remote-tracking branch 'origin/ah-simple' into ah-simple
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java
#	bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
#	bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
2025-02-24 16:52:36 +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 9f2b4df196 组词查询开发 2025-02-18 20:10:06 +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