Commits · 19a0ee7b812b786c3b205d5708b922da07dd901f · haoban3.0 / haoban-manage3.0 · GitLab

20 Oct, 2022 6 commits
- Merge branch 'feature-haoban-role' into developer · 19a0ee7b
  墨竹 authored Oct 20, 2022
  
  19a0ee7b Browse Files
- feat：打印日志 · 50746122
  墨竹 authored Oct 20, 2022
  
  50746122 Browse Files
- feat：返回数据修改 · 3da1fe64
  墨竹 authored Oct 20, 2022
  
  3da1fe64 Browse Files
- Merge branch 'feature-haoban-role' into developer · 9a425660
  墨竹 authored Oct 20, 2022
  
  9a425660 Browse Files
- feat：返回数据修改 · 9c52a1cb
  墨竹 authored Oct 20, 2022
  
  9c52a1cb Browse Files
- feat：审核权限 · fccbf11e
  墨竹 authored Oct 20, 2022
  
  fccbf11e Browse Files
19 Oct, 2022 12 commits
- Merge branch 'feature-haoban-role' into developer · 8a4566d6
  墨竹 authored Oct 19, 2022
  
  8a4566d6 Browse Files
- feat：文案调整 · 721dcfb9
  墨竹 authored Oct 19, 2022
  
  721dcfb9 Browse Files
- Merge branch 'feature-haoban-role' into developer · 25d76637
  墨竹 authored Oct 19, 2022
  
  25d76637 Browse Files
- feat：文案 · 95a1306f
  墨竹 authored Oct 19, 2022
  
  95a1306f Browse Files
- Merge branch 'feature-haoban-role' into developer · 2eb6af21
  墨竹 authored Oct 19, 2022
  
  2eb6af21 Browse Files
- feat：文案 · 8514d9b9
  墨竹 authored Oct 19, 2022
  
  8514d9b9 Browse Files
- Merge branch 'feature-haoban-role' into developer · c954b5b0
  墨竹 authored Oct 19, 2022
  
  c954b5b0 Browse Files
- feat：文案 · ef4b6ea7
  墨竹 authored Oct 19, 2022
  
  ef4b6ea7 Browse Files
- Merge branch 'feature-haoban-role' into developer · 3bf3711d
  墨竹 authored Oct 19, 2022
  
  3bf3711d Browse Files
- feat：权限初始化 · ad675efe
  墨竹 authored Oct 19, 2022
  
  ad675efe Browse Files
- Merge branch 'feature-haoban-role' into developer · c0df0acf
  墨竹 authored Oct 19, 2022
  
  c0df0acf Browse Files
- feat：权限初始化 · b9d82bb3
  墨竹 authored Oct 19, 2022
  
  b9d82bb3 Browse Files
18 Oct, 2022 6 commits
- Merge branch 'feature-haoban-role' into developer · ece3aae0
  墨竹 authored Oct 18, 2022
  
  ece3aae0 Browse Files
- fix：区经获取数量修改 · 2e0ee75d
  墨竹 authored Oct 18, 2022
  
  2e0ee75d Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · a472ded8
```
导购转移门店恢复

See merge request !320
```
  徐高华 authored Oct 18, 2022
  a472ded8 Browse Files
- 导购转移门店恢复 · a94b9f47
  徐高华 authored Oct 18, 2022
  
  a94b9f47 Browse Files
- Merge branch 'feature-haoban-role' into developer · 835694c6
  墨竹 authored Oct 18, 2022
  
  835694c6 Browse Files
- fix：判断空 · 492f477a
  墨竹 authored Oct 18, 2022
  
  492f477a Browse Files
17 Oct, 2022 16 commits
- Merge branch 'feature-haoban-role' into 'developer' · 0e0e5a9c
```
导购门店转移

See merge request !319
```
  徐高华 authored Oct 17, 2022
  0e0e5a9c Browse Files
- 导购门店转移 · 6344a706
  徐高华 authored Oct 17, 2022
  
  6344a706 Browse Files
- Merge branch 'feature-haoban-role' into 'developer' · 6d65875c
```
Feature haoban role

See merge request !318
```
  徐高华 authored Oct 17, 2022
  6d65875c Browse Files
- test · c7c94b82
  徐高华 authored Oct 17, 2022
  
  c7c94b82 Browse Files
- fix：打印日志 · 037add80
  墨竹 authored Oct 17, 2022
  
  037add80 Browse Files
- Merge branch 'feature-haoban-role' into developer · 9ef93d82
  墨竹 authored Oct 17, 2022
  
  9ef93d82 Browse Files
- fix：导购编辑放开 · 33f954c1
  墨竹 authored Oct 17, 2022
  
  33f954c1 Browse Files
- Merge branch 'feature-haoban-role' into developer · 1b5c0b02
  墨竹 authored Oct 17, 2022
  
  1b5c0b02 Browse Files
- fix：日志 · 537f2d6a
  墨竹 authored Oct 17, 2022
  
  537f2d6a Browse Files
- Merge branch 'feature-haoban-role' into developer · b8ce8074
  墨竹 authored Oct 17, 2022
  
  b8ce8074 Browse Files
- fix：初始化调整 · 71fa35a0
  墨竹 authored Oct 17, 2022
  
  71fa35a0 Browse Files
- Merge branch 'feature-haoban-role' into developer · 3130b47a
  墨竹 authored Oct 17, 2022
  
  3130b47a Browse Files
- fix：空指针 · fd1a7c8f
  墨竹 authored Oct 17, 2022
  
  fd1a7c8f Browse Files
- Merge branch 'feature-haoban-role' into developer · 1c95dbf8
  墨竹 authored Oct 17, 2022
  
  1c95dbf8 Browse Files
- fix：初始化调整 · d6ca8e2e
  墨竹 authored Oct 17, 2022
  
  d6ca8e2e Browse Files
- Merge remote-tracking branch 'origin/feature-haoban-role' into developer · b1fe5174
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
```
  徐高华 authored Oct 17, 2022
  b1fe5174 Browse Files