Commits · 51aa770995b0f91ef6b8344b9aa6c75bc2572ed8 · lanbaoming / jiedao-api-boot-master

14 Sep, 2024 6 commits
- Merge branch 'release-fix' into release · 51aa7709
  yanghao authored Sep 14, 2024
  
  51aa7709
- chore: 客户合并中订单相关合并和日志纪录 · f7df0151
  yanghao authored Sep 14, 2024
  
  f7df0151
- Merge branch 'release-bugfix-zhangfeng' into 'release' · 26d55274
  zhangfeng authored Sep 14, 2024
```
Release bugfix zhangfeng

See merge request !20
```
  26d55274
- feat-482: 积分记录列表，添加积分到期时间 · a939279d
  zhangfeng authored Sep 14, 2024
  
  a939279d
- feat-492: 客户端兑换日志列表新增兑换状态显示 · 97eb32a8
  zhangfeng authored Sep 14, 2024
  
  97eb32a8
- bugfix-473: 积分规则详情创建人，最后更新人修改 · 7cc93f49
  zhangfeng authored Sep 14, 2024
  
  7cc93f49
13 Sep, 2024 10 commits
- feat(member): 分享统计详情单独页面 · 79c85620
  zhangfeng authored Sep 13, 2024
  
  79c85620
- bugfix-366: 礼品管理不可选已关闭的仓库 · e9ca45a6
  zhangfeng authored Sep 13, 2024
  
  e9ca45a6
- Merge branch 'release-bugfix-zhangfeng' into 'release' · 155b1cdf
  zhangfeng authored Sep 13, 2024
```
bugfix-438,443: 分享统计id命名，客户端活动列表筛选

See merge request !19
```
  155b1cdf
- bugfix-438,443: 分享统计id命名，客户端活动列表筛选 · 08e9b30d
  zhangfeng authored Sep 13, 2024
  
  08e9b30d
- Merge remote-tracking branch 'origin/release' into release · f3f9469d
  332784038@qq.com authored Sep 13, 2024
  
  f3f9469d
- 特需查询sql参数调整 · e5d427d7
  332784038@qq.com authored Sep 13, 2024
  
  e5d427d7
- 增加区号 · 19894baa
  joy authored Sep 13, 2024
  
  19894baa
- 提货异常问题修改 · 2a220a51
  332784038@qq.com authored Sep 13, 2024
  
  2a220a51
- Merge branch 'master-fix' into release · 5ecca232
  332784038@qq.com authored Sep 13, 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
```
  5ecca232
- 自编号状态防重复提交错误提示修正 · dd0cc472
  332784038@qq.com authored Sep 13, 2024
  
  dd0cc472
12 Sep, 2024 18 commits
- 异常订单备案查询条件错误 · 538b8789
  chenjiuping authored Sep 12, 2024
  
  538b8789
- 异常订单备案查询条件错误 · b16f8722
  chenjiuping authored Sep 12, 2024
  
  b16f8722
- 提货bug&出货查询 · e58bbf3c
  huyf authored Sep 12, 2024
  
  e58bbf3c
- 异常订单备案查询条件错误 · 89d0ca5a
  chenjiuping authored Sep 12, 2024
  
  89d0ca5a
- 异常订单备案查询条件错误 · 3379e228
  chenjiuping authored Sep 12, 2024
  
  3379e228
- Merge branch 'master-fix' into release · b4996afa
  zhengyi authored Sep 12, 2024
  
  b4996afa
- 报关删单退场业务bug修复 · 3976f929
  zhengyi authored Sep 12, 2024
  
  3976f929
- Merge remote-tracking branch 'origin/release-fix' into release-fix · d9f1e3f3
  zhengyi authored Sep 12, 2024
  
  d9f1e3f3
- sql修复 · 810fe9c9
  332784038@qq.com authored Sep 12, 2024
  
  810fe9c9
- 动态查询参数封装运输方式参数bug修复 · 22dabe4b
  332784038@qq.com authored Sep 12, 2024
  
  22dabe4b
- sql修复 · 5a67b5a2
  332784038@qq.com authored Sep 12, 2024
  
  5a67b5a2
- 订单动态多参数查询bug修复 · 650929dd
  332784038@qq.com authored Sep 12, 2024
  
  650929dd
- 订单动态多参数查询bug修复 · 531164a7
  332784038@qq.com authored Sep 12, 2024
  
  531164a7
- 订单中有无收货人字段值与发货人信息中区分，订单中只做是否有无收货人判断属性，客户中是是否允许设置控货无收货人 · 644b7db7
  332784038@qq.com authored Sep 12, 2024
  
  644b7db7
- sql优化 · f0fe3503
  332784038@qq.com authored Sep 12, 2024
  
  f0fe3503
- 补充部分sql的空运备货状态查询值 · 2691febe
  332784038@qq.com authored Sep 12, 2024
  
  2691febe
- 补充是否外部仓部分sql条件 · 769d94cf
  332784038@qq.com authored Sep 12, 2024
  
  769d94cf
- sql修复 · be0b6505
  332784038@qq.com authored Sep 12, 2024
  
  be0b6505
11 Sep, 2024 6 commits
- 订单详情的时间参数格式化注解补充 · 559ef3df
  zhengyi authored Sep 11, 2024
  
  559ef3df
- 异常订单查询添加商品类开和增值服务 · d8081fc4
  chenjiuping authored Sep 11, 2024
  
  d8081fc4
- 异常订单统计出错 · e33dfd53
  chenjiuping authored Sep 11, 2024
  
  e33dfd53
- Merge branch 'release-zhangfeng' into 'release' · 612039b7
  zhangfeng authored Sep 11, 2024
```
feat(member): 积分规则分享部分补充开发

See merge request !18
```
  612039b7
- feat(member): 积分规则分享部分补充开发 · 4d33efb3
  zhangfeng authored Sep 09, 2024
  
  4d33efb3
- sql修复 · 1e34bc2b
  332784038@qq.com authored Sep 11, 2024
  
  1e34bc2b