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

23 Apr, 2023 4 commits
- Merge branch 'ferture/四月迭代需求' into 'developer' · e215c0c0
```
过滤非上线门店

See merge request !1189
```
  徐高华 authored Apr 23, 2023
  e215c0c0 Browse Files
- 过滤非上线门店 · 1957b8ea
  徐高华 authored Apr 23, 2023
  
  1957b8ea Browse Files
- Merge branch 'ferture/四月迭代需求' into 'developer' · 897aaa70
```
区经绑定

See merge request !1188
```
  徐高华 authored Apr 23, 2023
  897aaa70 Browse Files
- 区经绑定 · 9dd5cd44
  徐高华 authored Apr 23, 2023
  
  9dd5cd44 Browse Files
21 Apr, 2023 23 commits
- Merge branch 'bugfix_memberId_empry_str' into developer · 2c5f4279
  songyinghui authored Apr 21, 2023
  
  2c5f4279 Browse Files
- feat: 销售线索通知过滤空串 · ee1735c9
  songyinghui authored Apr 21, 2023
  
  ee1735c9 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 4b91f4f5
```
客户联系标识bug

See merge request !1186
```
  徐高华 authored Apr 21, 2023
  4b91f4f5 Browse Files
- 客户联系标识bug · bb68bd15
  徐高华 authored Apr 21, 2023
  
  bb68bd15 Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 9cc5e2c1
  jinxin authored Apr 21, 2023
  
  9cc5e2c1 Browse Files
- 查询是否存在企业微信订单状态为待支付 · 696d3790
  jinxin authored Apr 21, 2023
  
  696d3790 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-04-21' into developer · 034ac198
  jinxin authored Apr 21, 2023
  
  034ac198 Browse Files
- 操作人名字问题处理 · 35428b39
  jinxin authored Apr 21, 2023
  
  35428b39 Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 7c091214
  jinxin authored Apr 21, 2023
  
  7c091214 Browse Files
- 倒计时问题处理 · 970ac92d
  jinxin authored Apr 21, 2023
  
  970ac92d Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 4c2072f1
```
# Conflicts:
#	haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java
```
  jinxin authored Apr 21, 2023
  4c2072f1 Browse Files
- 倒计时问题处理 · d9023c2b
  jinxin authored Apr 21, 2023
  
  d9023c2b Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 73ac5cce
```
自建

See merge request !1185
```
  徐高华 authored Apr 21, 2023
  73ac5cce Browse Files
- 自建 · f867f4f7
  徐高华 authored Apr 21, 2023
  
  f867f4f7 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 5f22f5a3
```
自建调整

See merge request !1184
```
  徐高华 authored Apr 21, 2023
  5f22f5a3 Browse Files
- 自建调整 · 9320144c
  徐高华 authored Apr 21, 2023
  
  9320144c Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 6a96ca31
```
会员工具

See merge request !1183
```
  徐高华 authored Apr 21, 2023
  6a96ca31 Browse Files
- 会员工具 · 602e425f
  徐高华 authored Apr 21, 2023
  
  602e425f Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 2b7f22d0
```
自建

See merge request !1182
```
  徐高华 authored Apr 21, 2023
  2b7f22d0 Browse Files
- 自建 · 3827d0e5
  徐高华 authored Apr 21, 2023
  
  3827d0e5 Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 6a978539
  jinxin authored Apr 21, 2023
  
  6a978539 Browse Files
- 日志处理 · aa0c2b4e
  jinxin authored Apr 21, 2023
  
  aa0c2b4e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 99353184
  jinxin authored Apr 21, 2023
  
  99353184 Browse Files
20 Apr, 2023 13 commits
- Merge branch 'feature-content2' into 'master' · 5fe4f80c
```
feat: 周报发送逻辑

See merge request !1181
```
  songyinghui authored Apr 21, 2023
  5fe4f80c Browse Files
- Merge branch 'feature-content2' into developer · e037a0e7
  songyinghui authored Apr 21, 2023
  
  e037a0e7 Browse Files
- feat: 周报发送逻辑 · 25cb43ea
  songyinghui authored Apr 21, 2023
  
  25cb43ea Browse Files
- Merge branch 'feature-content2' into 'master' · 0e0b8665
```
feat: 分片写

See merge request !1180
```
  songyinghui authored Apr 21, 2023
  0e0b8665 Browse Files
- feat: 分片写 · be72f9cf
  songyinghui authored Apr 21, 2023
  
  be72f9cf Browse Files
- Merge branch 'feature-content2' into 'master' · 3ecf2e9a
```
Feature content2

See merge request !1179
```
  王祖波 authored Apr 21, 2023
  3ecf2e9a Browse Files
- Merge branch 'feature-content2' into developer · 4fd9dd92
  王祖波 authored Apr 21, 2023
  
  4fd9dd92 Browse Files
- Merge remote-tracking branch 'origin/feature-content2' into feature-content2 · 739c5280
  王祖波 authored Apr 21, 2023
  
  739c5280 Browse Files
- 过滤有效企微 · 81764e92
  王祖波 authored Apr 21, 2023
  
  81764e92 Browse Files
- Merge branch 'feature-content2' into 'master' · 35c958a8
```
feat: topic切换

See merge request !1178
```
  songyinghui authored Apr 20, 2023
  35c958a8 Browse Files
- feat: topic切换 · cca38b42
  songyinghui authored Apr 20, 2023
  
  cca38b42 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 01c4d7e9
```
自建

See merge request !1177
```
  徐高华 authored Apr 20, 2023
  01c4d7e9 Browse Files
- 自建 · 3f5a34dd
  徐高华 authored Apr 20, 2023
  
  3f5a34dd Browse Files