Commits · ec8ebf63f139b4e3c35cc8e96808562dff39e2d5 · ui / merchant-manage-ui

17 Jul, 2023 2 commits

Merge branch 'feature/sourcemap-merchant' of... · ec8ebf63

guang.wu authored Jul 17, 2023

Merge branch 'feature/sourcemap-merchant' of git.quantgroup.cn:ui/merchant-manage-ui into feature/merchant-info-alter

ec8ebf63

Merge branch 'feature/merchant-info-edit' of... · f75411e0

guang.wu authored Jul 17, 2023

Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/merchant-info-alter

f75411e0

06 Jul, 2023 6 commits
- fix: 删除没用代码 · 5ea1442e
  武广 authored Jul 06, 2023
  
  5ea1442e
- Merge branch 'feature/merchant-info-edit' of... · c4a40763
  武广 authored Jul 06, 2023
```
Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  c4a40763
- Merge branch 'feature/sourcemap' of git.quantgroup.cn:ui/merchant-manage-ui... · ace5419e
  武广 authored Jul 06, 2023
```
Merge branch 'feature/sourcemap' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  ace5419e
- fix: 修改打包问题 · 217b1c77
  武广 authored Jul 06, 2023
  
  217b1c77
- fix: 修改样式问题 · f1e04f6a
  武广 authored Jul 06, 2023
  
  f1e04f6a
- fix: 修改样式问题 · fccde39d
  武广 authored Jul 06, 2023
```
订单列表的异常订单备注，备注后不变色（原来是变成黄色）
```
  fccde39d
04 Jul, 2023 5 commits
- Merge branch 'feature/sourcemap' of git.quantgroup.cn:ui/merchant-manage-ui... · 1284ccdf
  武广 authored Jul 04, 2023
```
Merge branch 'feature/sourcemap' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  1284ccdf
- fix: 对餐段进行优化 · 09d74448
  武广 authored Jul 04, 2023
  
  09d74448
- Merge branch 'feature/merchant-info-edit' of... · aa98368c
  武广 authored Jul 04, 2023
```
Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  aa98368c
- fix: 修改变更营业执照取消后还传执照的问题 · 76ceddb9
  武广 authored Jul 04, 2023
  
  76ceddb9
- fix: 删除多余代码 · e2d538f3
  武广 authored Jul 04, 2023
  
  e2d538f3
03 Jul, 2023 6 commits
- fix: 修改变更营业执照取消后还传执照的问题 · 7785342e
  武广 authored Jul 03, 2023
  
  7785342e
- Merge branch 'feature/merchant-info-edit' of... · a33a99c3
  武广 authored Jul 03, 2023
```
Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  a33a99c3
- fix: 放开按钮功能 · 8b80b629
  武广 authored Jul 03, 2023
  
  8b80b629
- fix: 放开企业名称修改按钮 · 9b794fb1
  武广 authored Jul 03, 2023
  
  9b794fb1
- Merge branch 'feature/merchant-info-edit' of... · 4737ee34
  武广 authored Jul 03, 2023
```
Merge branch 'feature/merchant-info-edit' of git.quantgroup.cn:ui/merchant-manage-ui into feature/sourcemap-merchant
```
  4737ee34
- fix: 放开编辑商户信息功能 · be8a1f7a
  武广 authored Jul 03, 2023
  
  be8a1f7a
29 Jun, 2023 7 commits
- fix: 优化可售日期 · 822cd441
  武广 authored Jun 29, 2023
  
  822cd441
- fix: 优化搜索框查询按钮的label宽度置为0 · d7d30b15
  武广 authored Jun 29, 2023
  
  d7d30b15
- fix: 修改获取企业餐段问题 · 97e42a3b
  武广 authored Jun 29, 2023
  
  97e42a3b
- fix: 修改获取列表接口 · 10f7fb21
  武广 authored Jun 29, 2023
  
  10f7fb21
- fix: 修改餐段修改错误问题 · ad8efe20
  武广 authored Jun 29, 2023
  
  ad8efe20
- fix: 修改文案 · cd62ae9c
  武广 authored Jun 29, 2023
  
  cd62ae9c
- fix: 修改错误文案文字 · dd28f8e4
  武广 authored Jun 29, 2023
  
  dd28f8e4
28 Jun, 2023 6 commits
- fix: 修改报错问题 · 25f72d2d
  武广 authored Jun 28, 2023
  
  25f72d2d
- Merge branch 'feat/a' into 'feature/sourcemap' · ccfa4bf6
  徐光星 authored Jun 28, 2023
```
feat: 补充安装依赖包

See merge request !96
```
  ccfa4bf6
- feat: 补充安装依赖包 · 78a2b26f
  徐光星 authored Jun 28, 2023
  
  78a2b26f
- feat: 添加sourcemap · dfe9f824
  武广 authored Jun 28, 2023
  
  dfe9f824
- fix: 去掉sourcemap · 2e4f3e20
  武广 authored Jun 28, 2023
  
  2e4f3e20
- fix: 优化打包 - 多进程打包 + sourcemap · 3a1b61e8
  武广 authored Jun 28, 2023
  
  3a1b61e8
27 Jun, 2023 8 commits
- fix: 修改餐段可售日期问题 · a3f611a8
  武广 authored Jun 27, 2023
  
  a3f611a8
- Merge branch 'feature/meal-3.0' of... · 2ac60452
  张子雨 authored Jun 27, 2023
```
Merge branch 'feature/meal-3.0' of http://git.quantgroup.cn/ui/merchant-manage-ui into feature/meal-3.0
```
  2ac60452
- feat: 拉黑员工优化 · 32cbdb6f
  张子雨 authored Jun 27, 2023
  
  32cbdb6f
- fix: 修改实例化的位置 · 329fb141
  武广 authored Jun 27, 2023
  
  329fb141
- fix: 修改虚拟商品修改餐段校验问题 · 0d021097
  武广 authored Jun 27, 2023
  
  0d021097
- fix: 修改IframeBridge方法 · fb03e418
  武广 authored Jun 27, 2023
  
  fb03e418
- fix: 修改日志 · efb70eeb
  武广 authored Jun 27, 2023
  
  efb70eeb
- fix: 修改跳转登录问题 · 3b2d28b7
  武广 authored Jun 27, 2023
  
  3b2d28b7