Commits · 6da71c36e260d8f3b7a8eeca6c3ece1911d6f3c4 · haoban3.0 / haoban-manage3.0 · GitLab

21 Sep, 2022 3 commits
- fix:报错 · 6da71c36
  墨竹 authored Sep 21, 2022
  
  6da71c36 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 32f9e16c
```
删除无效代码

See merge request !262
```
  徐高华 authored Sep 21, 2022
  32f9e16c Browse Files
- 删除无效代码 · 3e52a76a
  徐高华 authored Sep 21, 2022
  
  3e52a76a Browse Files
20 Sep, 2022 2 commits
- Merge branch 'master-xgh-好办停用' into 'master' · 0b5bcd22
```
删除通过名称查询

See merge request !259
```
  徐高华 authored Sep 20, 2022
  0b5bcd22 Browse Files
- 删除通过名称查询 · 2b3a3b53
  徐高华 authored Sep 20, 2022
  
  2b3a3b53 Browse Files
19 Sep, 2022 26 commits
- Merge branch 'master-xgh-好办停用' into 'master' · a464f229
```
sql

See merge request !257
```
  徐高华 authored Sep 20, 2022
  a464f229 Browse Files
- sql · ad3d79f1
  徐高华 authored Sep 20, 2022
  
  ad3d79f1 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · b2d69862
```
修复外部联系人查询

See merge request !255
```
  徐高华 authored Sep 20, 2022
  b2d69862 Browse Files
- 修复外部联系人查询 · ee321b27
  徐高华 authored Sep 20, 2022
  
  ee321b27 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 945c91f2
```
外部联系人

See merge request !252
```
  徐高华 authored Sep 20, 2022
  945c91f2 Browse Files
- 外部联系人 · cd6e456d
  徐高华 authored Sep 20, 2022
  
  cd6e456d Browse Files
- fix：增加日志 · 001af8a3
  墨竹 authored Sep 20, 2022
  
  001af8a3 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · a547c56a
```
修复查询外部联系人

See merge request !251
```
  徐高华 authored Sep 20, 2022
  a547c56a Browse Files
- 修复查询外部联系人 · e503c0a4
  徐高华 authored Sep 20, 2022
  
  e503c0a4 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · a637b07a
```
log

See merge request !248
```
  徐高华 authored Sep 19, 2022
  a637b07a Browse Files
- log · b94f31dc
  徐高华 authored Sep 19, 2022
  
  b94f31dc Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 86eecbf5
```
第三方和代开id

See merge request !246
```
  徐高华 authored Sep 19, 2022
  86eecbf5 Browse Files
- 第三方和代开id · c7ee0b00
  徐高华 authored Sep 19, 2022
  
  c7ee0b00 Browse Files
- Merge remote-tracking branch 'origin/master' · 5e47cead
  墨竹 authored Sep 19, 2022
  
  5e47cead Browse Files
- Merge branch 'feat-0919' · ae46a9e6
  墨竹 authored Sep 19, 2022
  
  ae46a9e6 Browse Files
- fix:修复企业id未传问题 · e1557649
  墨竹 authored Sep 19, 2022
  
  e1557649 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 8a6caa26
```
好办停用

See merge request !243
```
  徐高华 authored Sep 19, 2022
  8a6caa26 Browse Files
- 好办停用 · 285111ff
  徐高华 authored Sep 19, 2022
  
  285111ff Browse Files
- Merge branch 'master' into 'master-xgh-好办停用' · 3993f6df
```
# Conflicts:
#   haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
```
  徐高华 authored Sep 19, 2022
  3993f6df Browse Files
- test · 01765116
  徐高华 authored Sep 19, 2022
  
  01765116 Browse Files
- test · 6ea50fdc
  徐高华 authored Sep 19, 2022
  
  6ea50fdc Browse Files
- test · aab84d9e
  徐高华 authored Sep 19, 2022
  
  aab84d9e Browse Files
- test · b4df80b6
  徐高华 authored Sep 19, 2022
  
  b4df80b6 Browse Files
- 好办过期 · ff94c938
  徐高华 authored Sep 19, 2022
  
  ff94c938 Browse Files
- Merge branch 'master-xgh-好办停用' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · cf09d549
```
# Conflicts:
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-service/src/test/java/HmPageServiceTest.java
```
  墨竹 authored Sep 19, 2022
  cf09d549 Browse Files
- Merge branch 'feat-0919' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · a8267cb7
  墨竹 authored Sep 19, 2022
  
  a8267cb7 Browse Files
16 Sep, 2022 3 commits
- Merge branch 'master_xgh_0916_bug' into 'master' · 02d9a2eb
```
tokenbug修改

See merge request !237
```
  徐高华 authored Sep 16, 2022
  02d9a2eb Browse Files
- tokenbug修改 · 92053ffe
  徐高华 authored Sep 16, 2022
  
  92053ffe Browse Files
- fix:空指针 · 86b70229
  墨竹 authored Sep 16, 2022
  
  86b70229 Browse Files
15 Sep, 2022 5 commits
- fix:删除门店好友关系解除 · ddabacbf
  墨竹 authored Sep 15, 2022
  
  ddabacbf Browse Files
- fix:空指针修改 · 6f2c28dd
  墨竹 authored Sep 15, 2022
  
  6f2c28dd Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 25157c99
  墨竹 authored Sep 15, 2022
  
  25157c99 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 634e9590
  墨竹 authored Sep 15, 2022
  
  634e9590 Browse Files
- fix:会员删除导购bug修改 · ac3c4ab5
  墨竹 authored Sep 15, 2022
  
  ac3c4ab5 Browse Files
14 Sep, 2022 1 commit
- Merge branch 'fixbug_0914' into 'master' · b766b9ab
```
导出无部门bug

See merge request !235
```
  徐高华 authored Sep 14, 2022
  b766b9ab Browse Files