Commit Graph

36 Commits

Author SHA1 Message Date
24c4d039b4 修改bug 2025-02-20 15:21:37 +08:00
9b6a3a3fdb Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
2025-02-20 11:37:55 +08:00
6225d23311 现金、积分分润逻辑实现 2025-02-20 11:36:04 +08:00
10d3387b91 Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
2025-02-20 11:32:05 +08:00
246785dfd8 现金、积分分润逻辑实现 2025-02-20 11:31:36 +08:00
4dd372831b Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
2025-02-20 11:29:59 +08:00
68a2e24223 现金、积分分润逻辑实现 2025-02-20 11:29:20 +08:00
d1c461e02d Merge remote-tracking branch 'origin/main-zhb'
# Conflicts:
#	mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
2025-02-20 11:23:07 +08:00
c572ec0f84 现金、积分分润逻辑实现 2025-02-20 11:18:28 +08:00
0b4ce84d7f Merge pull request '会员中心代码提交' (#9) from main-cx into main
Reviewed-on: #9
2025-02-19 17:09:45 +08:00
72a723a7f1 会员中心代码提交 2025-02-19 17:09:19 +08:00
dddb336586 Merge pull request '首页代码完善实现' (#8) from main-cx into main
Reviewed-on: #8
2025-02-19 10:59:27 +08:00
5f49434239 首页代码完善实现 2025-02-19 10:58:55 +08:00
5bd4ab7d2e Merge pull request '首页逻辑实现' (#7) from main-cx into main
Reviewed-on: #7
2025-02-18 17:09:24 +08:00
4edd8ea7e5 首页逻辑实现 2025-02-18 17:09:02 +08:00
2b5f4c3c5e Merge remote-tracking branch 'origin/main-zhb' 2025-02-18 14:02:32 +08:00
5b8eef7bd2 发展基金相关实现修改 2025-02-18 14:00:39 +08:00
edb449a1ec Merge pull request '积分专区的实现' (#6) from main-cx into main
Reviewed-on: #6
2025-02-18 13:59:36 +08:00
df3f042b2c 积分专区的实现 2025-02-18 13:58:16 +08:00
b594007638 Merge remote-tracking branch 'origin/main-zhb' 2025-02-18 13:42:51 +08:00
dfba7801e2 发展基金相关实现修改 2025-02-18 13:42:07 +08:00
de23604153 Merge pull request '发展基金相关实现-增加发展基金' (#5) from main-zhb into main
Reviewed-on: #5
2025-02-17 16:00:49 +08:00
c18db6ffd3 发展基金相关实现-增加发展基金 2025-02-17 15:57:20 +08:00
7cd193f8a2 Merge remote-tracking branch 'origin/main' 2025-02-17 14:29:59 +08:00
2a009e9037 发展基金相关实现-查询发展基金 2025-02-17 14:28:22 +08:00
09e716df0c Merge pull request '发展基金相关实现-查询发展基金' (#4) from main-zhb into main
Reviewed-on: #4
2025-02-17 14:26:45 +08:00
f7d4349bdb 发展基金相关实现-查询发展基金 2025-02-17 14:18:25 +08:00
0b2d5f65f6 Merge pull request '积分专区的实现' (#3) from main-cx into main
Reviewed-on: #3
2025-02-17 14:17:37 +08:00
6da09d93fd 积分专区的实现 2025-02-17 14:15:26 +08:00
59c83b2fbb Merge pull request '修改会员专区和积分专区的逻辑' (#2) from main-cx into main
Reviewed-on: #2
2025-02-17 10:14:57 +08:00
d781eaa358 修改会员专区和积分专区的逻辑 2025-02-17 10:13:22 +08:00
23205f1142 Merge pull request '增加会员专区 积分专区 积分兑换内容 增加三个专区的字段' (#1) from main-cx into main
Reviewed-on: #1
2025-02-14 16:02:11 +08:00
48f6dd405b 增加会员专区 积分专区 积分兑换内容 增加三个专区的字段 2025-02-14 15:47:15 +08:00
eb6bfec709 删除 mysql 2025-02-10 11:09:32 +08:00
0badf9eac2 添加 mysql 2025-02-10 11:07:40 +08:00
mcbird2009@qq.com
68005e6961 慧麦商城 2024-12-13 15:21:20 +08:00