Commits · aa675e07545cccaa2c50dfbf9fc18cfd1526dcd6 · lanbaoming / jiedao-app-operator-master · GitLab

14 Jan, 2025 5 commits
- Merge branch 'jd_dev' of... · aa675e07
  knight authored Jan 14, 2025
```
Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into jd_dev
```
  aa675e07
- 需求86 客户投诉页面和列表调整 · 3e62134c
  knight authored Jan 14, 2025
  
  3e62134c
- bug180 【订单-异常订单】建议将<显示/隐藏/刷新>调小，现在太突兀了 · 042596e9
  honghy authored Jan 14, 2025
  
  042596e9
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 5d7b7680
  Smile authored Jan 14, 2025
  
  5d7b7680
- bug184: (生产)【(APP/h5)】首页弹窗，无法文显示 · b8cc65ec
  Smile authored Jan 14, 2025
  
  b8cc65ec
13 Jan, 2025 2 commits
- bug177 优惠活动查看客户信息不全 · 14c8b7b5
  honghy authored Jan 13, 2025
  
  14c8b7b5
- bug178 优惠活动，线路没有显示 · 27ce01ff
  honghy authored Jan 13, 2025
  
  27ce01ff
09 Jan, 2025 2 commits
- bug170 订单编辑或者复制订单，目的国、线路、目的城市联动问题 · fc9e7f6b
  honghy authored Jan 09, 2025
  
  fc9e7f6b
- Merge branch 'pre-release' into 'jd_dev' · 91c4c353
  Administrator authored Jan 09, 2025
```
pre-release分支合并到jd分支0109

See merge request !131
```
  91c4c353
08 Jan, 2025 24 commits
- feat✨: 修复问题和批量生成收款单列表 · 762d1eec
  chenwei authored Jan 08, 2025
  
  762d1eec
- Merge branch 'pre-release' into 'jd_dev' · cde9b432
  Administrator authored Jan 08, 2025
```
需求32 客户投诉页面和列表调整

See merge request !130
```
  cde9b432
- 需求32 客户投诉页面和列表调整 · 4de12481
  knight authored Jan 08, 2025
  
  4de12481
- 需求32 客户投诉页面和列表调整 · efcd2159
  knight authored Jan 08, 2025
  
  efcd2159
- Merge branch 'pre-release' into 'jd_dev' · 60e0b24a
  Administrator authored Jan 08, 2025
```
Pre release分支合并到jd分支010803

See merge request !129
```
  60e0b24a
- bug164:复制“未发布”/“已启用”的记录，不修改任何数据，不应该提交成功 · 1817e057
  Smile authored Jan 08, 2025
  
  1817e057
- 需求31 报价单列表新增创建人 · 25917465
  knight authored Jan 07, 2025
  
  25917465
- 研发需求35 异常订单列表调整查询框位置 · 7e1a5e46
  Smile authored Jan 07, 2025
  
  7e1a5e46
- 研发需求33 海运-预装+空运-分拣查看订单信息 · a463e346
  Smile authored Jan 07, 2025
  
  a463e346
- bug159 会员详情更新页面中，修改“等级有效期“后”保存报：系统异常。请看截图 · fdba6f04
  Smile authored Jan 06, 2025
  
  fdba6f04
- fix:详情/更新会员等级页面中，将“等级有效期”改为日期组件。 · 92f1f195
  Smile authored Jan 06, 2025
  
  92f1f195
- 重置查询条件清空 · 9983a53d
  honghy authored Jan 04, 2025
  
  9983a53d
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 65f11633
  Smile authored Jan 08, 2025
  
  65f11633
- bug164:复制“未发布”/“已启用”的记录，不修改任何数据，不应该提交成功 · 30069717
  Smile authored Jan 08, 2025
  
  30069717
- 【后台-等级设置-复制】启动时间清空 · cd53a15a
  honghy authored Jan 04, 2025
  
  cd53a15a
- 会员等级：1、等级设置中新增/修改页面，“等级有效期”修改为必填。2、更新会员等级弹窗中，“等级有效期”修改为必填。 · be8b2e9d
  Smile authored Jan 04, 2025
  
  be8b2e9d
- 会员手动更新等级页面更新 · f0a79c29
  Smile authored Jan 03, 2025
  
  f0a79c29
- 会员等级那里不要显示“图片加载失败” · ffbb247e
  honghy authored Jan 03, 2025
  
  ffbb247e
- 会员等级那里不要显示“图片加载失败” · 1c1567ae
  honghy authored Jan 03, 2025
  
  1c1567ae
- 修正等级设置复制状态错误 · 34950e3e
  honghy authored Jan 03, 2025
  
  34950e3e
- 开放设为免泡按钮 · fc201c04
  Smile authored Jan 03, 2025
  
  fc201c04
- 会员等级手动配置显示修改 · 05bde6cb
  Smile authored Jan 03, 2025
  
  05bde6cb
- 【后台-等级设置-新增/修改】“名称”、“等级说明”输入需要修改。去掉不能输入空格限制，改为去除前后空格 · 79fbf432
  Smile authored Jan 04, 2025
  
  79fbf432
- Merge branch 'pre-release' into 'jd_dev' · 18bb191d
  Administrator authored Jan 08, 2025
```
Pre Release分支合并到jd分支20250108

See merge request !127
```
  18bb191d
07 Jan, 2025 7 commits
- fix🐛: 修复银行收款明细报错 · c5eb4608
  chenwei authored Jan 07, 2025
  
  c5eb4608
- feat✨: 字典和翻译财务2.2相关 · e21d9277
  chenwei authored Nov 29, 2024
  
  e21d9277
- Merge branch 'master-fix' into pre-release · 696ef223
  332784038@qq.com authored Jan 07, 2025
```
# Conflicts:
#	src/views/ecw/memberManagement/operatingLevel/index.vue
#	src/views/ecw/order/cargoControlDetailList.vue
#	src/views/ecw/order/index.vue
#	src/views/ecw/order/weightDeal.vue
#	src/views/member/user/memberDetails.vue
#	src/views/system/sms/smsNode.vue
```
  696ef223
- 卸柜到仓订单允许编辑订单信息逻辑修正 · b231ccd2
  332784038@qq.com authored Jan 07, 2025
  
  b231ccd2
- Merge branch 'master-fix' · 5ef7c05a
  332784038@qq.com authored Jan 07, 2025
  
  5ef7c05a
- 卸柜到仓订单允许编辑订单信息 · ffa48341
  332784038@qq.com authored Jan 07, 2025
  
  ffa48341
- 订单详情价格明细的最后价格更新时间值取值变动 · 29ab7491
  332784038@qq.com authored Jan 02, 2025
  
  29ab7491