Commits · 7452aae7fec4c6f3939bbf4079d9b1b9515f4940 · haoban3.0 / haoban-manage3.0 · GitLab

19 Sep, 2022 22 commits
- Merge remote-tracking branch 'origin/developer' into developer · 7452aae7
  墨竹 authored Sep 19, 2022
  
  7452aae7 Browse Files
- Merge branch 'feat-0919' into developer · 6d844cfc
  墨竹 authored Sep 19, 2022
  
  6d844cfc Browse Files
- fix:修复企业id未传问题 · e1557649
  墨竹 authored Sep 19, 2022
  
  e1557649 Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · 582237fc
```
Master xgh 好办停用

See merge request !244
```
  徐高华 authored Sep 19, 2022
  582237fc 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
- Merge branch 'master-xgh-好办停用' into 'developer' · e7a28d35
```
Master xgh 好办停用

See merge request !241
```
  徐高华 authored Sep 19, 2022
  e7a28d35 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 'feature-haoban-role' into developer · 8696bd24
  墨竹 authored Sep 19, 2022
  
  8696bd24 Browse Files
- feat:前端丢失精度问题 · 6f3a26a8
  墨竹 authored Sep 19, 2022
  
  6f3a26a8 Browse Files
- Merge branch 'feature-haoban-role' into developer · 2c0dd636
  墨竹 authored Sep 19, 2022
  
  2c0dd636 Browse Files
- feat:空指针 · 744e0ee4
  墨竹 authored Sep 19, 2022
  
  744e0ee4 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ec48cb71
  墨竹 authored Sep 19, 2022
  
  ec48cb71 Browse Files
- feat:空指针 · f5bf3ac9
  墨竹 authored Sep 19, 2022
  
  f5bf3ac9 Browse Files
- feat:空指针 · 6573c3ad
  墨竹 authored Sep 19, 2022
  
  6573c3ad Browse Files
- feat: fix start error · fe46af5b
  songyinghui authored Sep 19, 2022
  
  fe46af5b 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 10 commits
- Merge branch 'master_xgh_0916_bug' into 'master' · 02d9a2eb
```
tokenbug修改

See merge request !237
```
  徐高华 authored Sep 16, 2022
  02d9a2eb Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 0acccdb1
  墨竹 authored Sep 16, 2022
  
  0acccdb1 Browse Files
- Merge branch 'feature-haoban-role' into developer · 9774e9d5
  墨竹 authored Sep 16, 2022
  
  9774e9d5 Browse Files
- feat:区经督导管理门店数量接口 · 224efe06
  墨竹 authored Sep 16, 2022
  
  224efe06 Browse Files
- Merge branch 'master_xgh_0916_bug' into 'developer' · 7dad79f8
```
Master xgh 0916 bug

See merge request !236
```
  徐高华 authored Sep 16, 2022
  7dad79f8 Browse Files
- tokenbug修改 · 92053ffe
  徐高华 authored Sep 16, 2022
  
  92053ffe Browse Files
- fix:绑定区经督导接口 · 6df0ba6e
  墨竹 authored Sep 16, 2022
  
  6df0ba6e Browse Files
- Merge branch 'feat-0919' into developer · c86d733f
  墨竹 authored Sep 16, 2022
  
  c86d733f Browse Files
- fix:空指针 · 86b70229
  墨竹 authored Sep 16, 2022
  
  86b70229 Browse Files
- fix:初始化数据 · 5fab39a4
  墨竹 authored Sep 16, 2022
  
  5fab39a4 Browse Files
15 Sep, 2022 8 commits
- Merge branch 'developer' into feature-haoban-role · 79cdd02f
  墨竹 authored Sep 15, 2022
  
  79cdd02f Browse Files
- Merge branch 'feat-0919' into developer · 9a9a62e3
  墨竹 authored Sep 15, 2022
  
  9a9a62e3 Browse Files
- fix:删除门店好友关系解除 · ddabacbf
  墨竹 authored Sep 15, 2022
  
  ddabacbf Browse Files
- Merge branch 'feat-0919' into developer · 1f37f68e
  墨竹 authored Sep 15, 2022
  
  1f37f68e Browse Files
- fix:空指针修改 · 6f2c28dd
  墨竹 authored Sep 15, 2022
  
  6f2c28dd Browse Files
- Merge branch 'feat-0919' into developer · 41925e35
  墨竹 authored Sep 15, 2022
  
  41925e35 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 25157c99
  墨竹 authored Sep 15, 2022
  
  25157c99 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 634e9590
  墨竹 authored Sep 15, 2022
  
  634e9590 Browse Files