Commits · f09f738ff8477b82bc0563bc9884384be4188984 · lanbaoming / jiedao-api-boot-master · GitLab

03 Sep, 2024 10 commits
- Merge branch 'refs/heads/feature_member_score' into dev · f09f738f
  zhangfeng authored Sep 03, 2024
  
  f09f738f
- bugfix-172: 兑换记录ID命名规则修改 · 08b5603a
  zhangfeng authored Sep 03, 2024
  
  08b5603a
- bugfix-175: 礼品ID命名规则修改 · c01573f7
  zhangfeng authored Sep 03, 2024
  
  c01573f7
- bugfix-180: 手机号码搜索后点击会员名称显示异常 · 67345aaa
  zhangfeng authored Sep 03, 2024
  
  67345aaa
- bugfix-181: 积分规则唯一性更改提示词 · bed90de2
  zhangfeng authored Sep 03, 2024
  
  bed90de2
- bugfix-186: 后台新增兑换记录收件人姓名，电话，地址必填项改为非必填 · fddea7b4
  zhangfeng authored Sep 03, 2024
  
  fddea7b4
- Merge branch 'release-fix' into dev · 90e0becc
  332784038@qq.com authored Sep 03, 2024
  
  90e0becc
- 返回放货锁定收货人天数 · e641a573
  332784038@qq.com authored Sep 03, 2024
  
  e641a573
- Merge branch 'release-fix' into release · 299d235b
  332784038@qq.com authored Sep 03, 2024
  
  299d235b
- sql修复 · 1e0ae5f6
  332784038@qq.com authored Sep 03, 2024
  
  1e0ae5f6
02 Sep, 2024 11 commits
- Merge branch 'release-fix' into dev · 44e8abeb
  zhengyi authored Sep 02, 2024
  
  44e8abeb
- Merge branch 'release-fix' into release · ecb07228
  zhengyi authored Sep 02, 2024
  
  ecb07228
- 订单多状态转换bug修复 · 98a18787
  zhengyi authored Sep 02, 2024
  
  98a18787
- Merge branch 'release-fix' into release · 35c73cd1
  zhengyi authored Sep 02, 2024
  
  35c73cd1
- 控货订单多控货状态查询bug修复 · 9749efb6
  zhengyi authored Sep 02, 2024
  
  9749efb6
- Merge branch 'release-fix' into dev · 55eded11
  zhengyi authored Sep 02, 2024
  
  55eded11
- Merge branch 'release-fix' into release · be374b20
  zhengyi authored Sep 02, 2024
  
  be374b20
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 37a0a2fd
  zhengyi authored Sep 02, 2024
  
  37a0a2fd
- 1、控货订单列表的控货状态多条件查询完善 · 5b1552af
  zhengyi authored Sep 02, 2024
```
2、订单列表补充商品类型多条件查询
```
  5b1552af
- Merge branch 'release-fix' into release · 5dddd60d
  332784038@qq.com authored Sep 02, 2024
  
  5dddd60d
- 控货限制bug修复 · 97b0e422
  332784038@qq.com authored Sep 02, 2024
  
  97b0e422
31 Aug, 2024 19 commits
- Merge branch 'release-org' into release · 2db4e9ef
  zhengyi authored Aug 31, 2024
  
  2db4e9ef
- Merge branch 'release-org' into dev · a8039ef6
  zhengyi authored Aug 31, 2024
  
  a8039ef6
- 补充提交 · cbe00e26
  zhengyi authored Aug 31, 2024
  
  cbe00e26
- Merge branch 'release-org' into dev · 520d3838
  zhengyi authored Aug 31, 2024
  
  520d3838
- Merge branch 'release-org' into release · 2127b0d9
  zhengyi authored Aug 31, 2024
  
  2127b0d9
- 对订单相关查询参数进行全面重构 · 8835dae9
  zhengyi authored Aug 31, 2024
  
  8835dae9
- fix: 修复跟进纪录编号生成bug · 36d49522
  yanghao authored Aug 31, 2024
  
  36d49522
- sql: 更新跟进纪录相关字典 · 27376485
  yanghao authored Aug 31, 2024
  
  27376485
- chore: 客户跟进纪录的实现和下载接口的实现 · a5224c7e
  yanghao authored Aug 31, 2024
  
  a5224c7e
- chore: 客户详情页面返回默认付款和控制无收货人 · 2202b83a
  yanghao authored Aug 31, 2024
  
  2202b83a
- Merge branch '_dev_yh' into dev · 62ae6425
  yanghao authored Aug 31, 2024
  
  62ae6425
- 审批详情获取状态判断，返回值修正 · 1ccbae41
  zhengyi authored Aug 31, 2024
  
  1ccbae41
- chore: 根据客户日志中的创建/接收/捞取的最后行为时间来更新归属时间 · 295b2149
  yanghao authored Aug 31, 2024
  
  295b2149
- 审批状态bug修复 · 5d218482
  zhengyi authored Aug 31, 2024
  
  5d218482
- 审批状态bug修复 · 4a9c3b86
  zhengyi authored Aug 31, 2024
  
  4a9c3b86
- 流程模型key值错误修复 · 639016d9
  zhengyi authored Aug 31, 2024
  
  639016d9
- 审批初始化默认值修改 · 385c7ee6
  zhengyi authored Aug 31, 2024
  
  385c7ee6
- 代码错误修正 · 30944c3a
  zhengyi authored Aug 31, 2024
  
  30944c3a
- web-app的用户信息中返回其客户档案部分设置数据，以提供给前端做发货等操作数据判断 · 6c948192
  zhengyi authored Aug 31, 2024
  
  6c948192