Commits · 1c9d0acdbfbfeca22cddfdeb122740f727dceb49 · lanbaoming / jiedao-api-boot-master

19 Aug, 2024 2 commits
- Merge branch 'master-zhengyi' into dev · 1c9d0acd
  332784038@qq.com authored Aug 19, 2024
  
  1c9d0acd
- APP/WEB/官网，显示的订单动态中，空运和海运均屏蔽已清关动态（仅屏蔽，不做其他修改） · 4926e86c
  332784038@qq.com authored Aug 19, 2024
  
  4926e86c
15 Aug, 2024 5 commits
- Merge branch 'master-fix' · 28c79d9e
  332784038@qq.com authored Aug 15, 2024
  
  28c79d9e
- Merge branch 'master-customerService' into dev · 4dc5c0a9
  332784038@qq.com authored Aug 15, 2024
  
  4dc5c0a9
- 新建订单为草稿订单时，重新编辑订单后，订单归属业务经理值为空的bug修复 · 2bb309f0
  332784038@qq.com authored Aug 15, 2024
  
  2bb309f0
- Merge remote-tracking branch 'origin/master-fix' into dev · 3b0bba44
  332784038@qq.com authored Aug 15, 2024
  
  3b0bba44
- 订单到仓动态业务时间bug修复 · c31fe01c
  332784038@qq.com authored Aug 15, 2024
  
  c31fe01c
14 Aug, 2024 17 commits
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · da4a1023
  zhangfeng authored Aug 14, 2024
  
  da4a1023
- 客户端礼品详情优化 · 2d693130
  zhangfeng authored Aug 14, 2024
  
  2d693130
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 38a08d01
  zhangfeng authored Aug 14, 2024
  
  38a08d01
- 兑换礼品核销校验 · 45ce2726
  zhangfeng authored Aug 14, 2024
  
  45ce2726
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 2bfc582c
  zhangfeng authored Aug 14, 2024
  
  2bfc582c
- 客户端接口字典翻译 · c6ce937a
  zhangfeng authored Aug 14, 2024
  
  c6ce937a
- Merge branch 'refs/heads/dev' into feature_member_score · 69cfe5b4
  zhangfeng authored Aug 14, 2024
  
  69cfe5b4
- 兑换记录核销回退修改 · 369fbe44
  zhangfeng authored Aug 14, 2024
  
  369fbe44
- Revert "兑换记录核销回退修改" · 12ac6d29
  zhangfeng authored Aug 14, 2024
```
This reverts commit 0bc88d2f.
```
  12ac6d29
- Merge branch 'refs/heads/feature_member_score' into dev · 20246d5c
  zhangfeng authored Aug 14, 2024
  
  20246d5c
- 兑换记录核销回退修改 · 0bc88d2f
  zhangfeng authored Aug 14, 2024
  
  0bc88d2f
- 客户端兑换记录添加图片，单次兑换礼品积分 · 80ed7bf4
  zhangfeng authored Aug 14, 2024
  
  80ed7bf4
- Merge branch 'refs/heads/feature_member_score' into dev · 322b279b
  zhangfeng authored Aug 14, 2024
  
  322b279b
- 客户端兑换记录id转字符串 · 5097f231
  zhangfeng authored Aug 14, 2024
  
  5097f231
- Merge branch 'refs/heads/feature_member_score' into dev · 9ccf9251
  zhangfeng authored Aug 14, 2024
  
  9ccf9251
- 积分规则定时任务 · 8b70a7be
  zhangfeng authored Aug 14, 2024
  
  8b70a7be
- 网点区域树状列表获取 · d0ab099d
  zhangfeng authored Aug 14, 2024
  
  d0ab099d
13 Aug, 2024 13 commits
- Merge branch 'refs/heads/feature_member_score' into dev · e7152b1b
  zhangfeng authored Aug 13, 2024
  
  e7152b1b
- 获得会员积分分页获得城市异常 · 2b93bf94
  zhangfeng authored Aug 13, 2024
  
  2b93bf94
- 客户端积分日志排序 · 9c784d18
  zhangfeng authored Aug 13, 2024
  
  9c784d18
- Merge branch 'refs/heads/feature_member_score' into dev · c2d706b2
  zhangfeng authored Aug 13, 2024
  
  c2d706b2
- 礼品查询条件修改 · aa27c766
  zhangfeng authored Aug 13, 2024
  
  aa27c766
- 积分规则触发 · 695a7a6a
  zhangfeng authored Aug 13, 2024
  
  695a7a6a
- 客户端积分日志 · d6505e50
  zhangfeng authored Aug 13, 2024
  
  d6505e50
- 海运已装单bug · d05dbe2c
  huyf authored Aug 13, 2024
  
  d05dbe2c
- 海运已装单bug · a7d5f3d9
  huyf authored Aug 13, 2024
  
  a7d5f3d9
- Merge branch 'refs/heads/feature_member_score' into dev · ca0509cb
  zhangfeng authored Aug 13, 2024
  
  ca0509cb
- 客户端积分日志 · 3759d55c
  zhangfeng authored Aug 13, 2024
  
  3759d55c
- Merge branch 'master-fix' into dev · f6e14a01
  332784038@qq.com authored Aug 13, 2024
  
  f6e14a01
- 复制价格修改业务逻辑 · fc813808
  332784038@qq.com authored Aug 13, 2024
  
  fc813808
12 Aug, 2024 3 commits
- 海运已装单bug · d7d86440
  huyf authored Aug 12, 2024
  
  d7d86440
- 海运已装单bug · 4fa32e12
  huyf authored Aug 12, 2024
  
  4fa32e12
- Merge branch 'inquiry-zhengyi' into dev · a0a79940
  zhengyi authored Aug 12, 2024
```
# Conflicts:
#	yudao-server/src/main/resources/i18n/messages.properties
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties
```
  a0a79940