Commits · a40a865f92f5b799a670e5e8f7609169112384fe · haoban3.0 / haoban-manage3.0 · GitLab

24 Oct, 2022 8 commits
- Merge branch 'fixbug_1024' into developer · a40a865f
  墨竹 authored Oct 24, 2022
  
  a40a865f Browse Files
- fix：是否展示区经 · d36613c1
  墨竹 authored Oct 24, 2022
  
  d36613c1 Browse Files
- fix：判断调整 · 54c0f574
  墨竹 authored Oct 24, 2022
  
  54c0f574 Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · a6289785
```
去token

See merge request !328
```
  徐高华 authored Oct 24, 2022
  a6289785 Browse Files
- 去token · de8fac55
  徐高华 authored Oct 24, 2022
  
  de8fac55 Browse Files
- Merge branch 'feature-haoban-role' into developer · bf10282c
  墨竹 authored Oct 24, 2022
  
  bf10282c Browse Files
- Merge remote-tracking branch 'origin/feature-haoban-role' into feature-haoban-role · 99185043
  墨竹 authored Oct 24, 2022
  
  99185043 Browse Files
- fix：判断调整 · 4e7e7a39
  墨竹 authored Oct 24, 2022
  
  4e7e7a39 Browse Files
21 Oct, 2022 7 commits
- Merge branch 'feature-haoban-role' into 'master' · 66b110be
```
Feature haoban role

See merge request !327
```
  徐高华 authored Oct 21, 2022
  66b110be Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · d48d7737
```
token

See merge request !326
```
  徐高华 authored Oct 21, 2022
  d48d7737 Browse Files
- token · bffc9fa4
  徐高华 authored Oct 21, 2022
  
  bffc9fa4 Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · 37ca64ee
```
log

See merge request !325
```
  徐高华 authored Oct 21, 2022
  37ca64ee Browse Files
- log · b6538ecc
  徐高华 authored Oct 21, 2022
  
  b6538ecc Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · 5daefe0b
```
token

See merge request !324
```
  徐高华 authored Oct 21, 2022
  5daefe0b Browse Files
- token · fafe4e01
  徐高华 authored Oct 21, 2022
  
  fafe4e01 Browse Files
20 Oct, 2022 25 commits
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 917c41bc
  墨竹 authored Oct 21, 2022
  
  917c41bc Browse Files
- fix：空 · aa8eebfb
  墨竹 authored Oct 21, 2022
  
  aa8eebfb Browse Files
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 90458f9e
  墨竹 authored Oct 21, 2022
  
  90458f9e Browse Files
- fix：空调整 · 8a3eac9f
  墨竹 authored Oct 21, 2022
  
  8a3eac9f Browse Files
- fix：绑定区经修改 · 90f97e2c
  墨竹 authored Oct 21, 2022
  
  90f97e2c Browse Files
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 05677f4f
  墨竹 authored Oct 21, 2022
  
  05677f4f Browse Files
- fix：返回修改 · e7700a0b
  墨竹 authored Oct 21, 2022
  
  e7700a0b Browse Files
- fix：绑定区经修改 · 17ffffec
  墨竹 authored Oct 21, 2022
  
  17ffffec Browse Files
- fix：员工列表超时接口优化 · 4ff4943d
  墨竹 authored Oct 21, 2022
  
  4ff4943d Browse Files
- fix：门店绑定审核判断bug修改 · b0c508eb
  墨竹 authored Oct 21, 2022
  
  b0c508eb Browse Files
- fix：员工列表超时接口优化 · b22df708
  墨竹 authored Oct 21, 2022
  
  b22df708 Browse Files
- fix：员工列表超时接口优化 · 269abff9
  墨竹 authored Oct 21, 2022
  
  269abff9 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · cd12d685
  墨竹 authored Oct 20, 2022
  
  cd12d685 Browse Files
- Merge branch 'master' into developer · f50e39dd
  墨竹 authored Oct 20, 2022
  
  f50e39dd Browse Files
- Merge branch 'feature-haoban-role' into 'master' · 30083c62
```
导购

See merge request !323
```
  徐高华 authored Oct 20, 2022
  30083c62 Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · c4ca033c
```
导购

See merge request !322
```
  徐高华 authored Oct 20, 2022
  c4ca033c Browse Files
- 导购 · 56bd7f28
  徐高华 authored Oct 20, 2022
  
  56bd7f28 Browse Files
- fix：恢复操作日志 · f4cd3d3c
  墨竹 authored Oct 20, 2022
  
  f4cd3d3c Browse Files
- fix：恢复操作日志 · 78d74828
  墨竹 authored Oct 20, 2022
  
  78d74828 Browse Files
- fix：暂时先删除操作日志 · e3158593
  墨竹 authored Oct 20, 2022
  
  e3158593 Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · cdefc25c
```
开启配置

See merge request !321
```
  徐高华 authored Oct 20, 2022
  cdefc25c Browse Files
- 开启配置 · 93d4d8ec
  徐高华 authored Oct 20, 2022
  
  93d4d8ec Browse Files
- Merge branch 'feature-haoban-role' into developer · 95718e76
  墨竹 authored Oct 20, 2022
  
  95718e76 Browse Files
- fix：活码进行是否开启活码功能企业过滤 · ce4f4717
  墨竹 authored Oct 20, 2022
  
  ce4f4717 Browse Files
- Merge branch 'feature-haoban-role' into developer · 19a0ee7b
  墨竹 authored Oct 20, 2022
  
  19a0ee7b Browse Files