Commits · 571d04b881202d96b13e6bc10a5e5cd48cac63b6 · haoban3.0 / haoban-manage3.0

18 May, 2023 1 commit
- 为空判断 · 571d04b8
  zhangzhendong authored May 19, 2023
  
  571d04b8 Browse Files
15 May, 2023 2 commits
- 修改开关 · 068d4d90
  zhangzhendong authored May 15, 2023
  
  068d4d90 Browse Files
- 修改开关 · f4f8d325
  zhangzhendong authored May 15, 2023
  
  f4f8d325 Browse Files
12 May, 2023 4 commits

Merge branch 'master' into feature-消息中心 · 32f14a6f

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialReportBuilder.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/PotentialCustomerNotifyBuilder.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/MaterialReportServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

authored May 12, 2023

32f14a6f Browse Files

Merge branch 'feature/自建应用验证' into 'master' · 10bb0c1f
```
激活码

See merge request !1250
```
徐高华 authored May 12, 2023
10bb0c1f Browse Files
激活码 · 4c8b9d09
徐高华 authored May 12, 2023

4c8b9d09 Browse Files
修改报名 · 189c88fd
zhangzhendong authored May 12, 2023

189c88fd Browse Files

11 May, 2023 14 commits
- Merge branch 'feature/自建应用验证' into 'master' · 8cb0df03
```
群满

See merge request !1248
```
  徐高华 authored May 11, 2023
  8cb0df03 Browse Files
- 群满 · c03da95e
  徐高华 authored May 11, 2023
  
  c03da95e Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 92971fef
```
Feature/自建应用验证

See merge request !1245
```
  徐高华 authored May 11, 2023
  92971fef Browse Files
- 群满 · f5957876
  徐高华 authored May 11, 2023
  
  f5957876 Browse Files
- 群满 · 8e1e1421
  徐高华 authored May 11, 2023
  
  8e1e1421 Browse Files
- / · ab657393
  徐高华 authored May 11, 2023
  
  ab657393 Browse Files
- 群满处理 · 45d0e19f
  徐高华 authored May 11, 2023
  
  45d0e19f Browse Files
- Merge branch 'bugfix_0511_memberId_auth' into 'master' · b003cf9b
```
Bugfix 0511 member id auth

See merge request !1241
```
  songyinghui authored May 11, 2023
  b003cf9b Browse Files
- Merge remote-tracking branch 'origin/master' into bugfix_0511_memberId_auth · db1f24e2
  songyinghui authored May 11, 2023
  
  db1f24e2 Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 5eddaed5
```
群满

See merge request !1240
```
  徐高华 authored May 11, 2023
  5eddaed5 Browse Files
- 群满 · 3b45cd4c
  徐高华 authored May 11, 2023
  
  3b45cd4c Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' · c89b1036
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java
```
  徐高华 authored May 11, 2023
  c89b1036 Browse Files
- 群满 · da75f104
  徐高华 authored May 11, 2023
  
  da75f104 Browse Files
- 群满 · 6b10f095
  徐高华 authored May 11, 2023
  
  6b10f095 Browse Files
10 May, 2023 4 commits
- Merge branch 'bugfix/2023-05-11' into 'master' · 43dc96f6
```
企业微信订单新建

See merge request !1234
```
  jinxin authored May 10, 2023
  43dc96f6 Browse Files
- feat: 兼容异常情况 · e56e5e96
  songyinghui authored May 10, 2023
  
  e56e5e96 Browse Files
- feat: 会员Id非授权方式创建时监听binglog · 729f0cf6
  songyinghui authored May 10, 2023
  
  729f0cf6 Browse Files
- 企业微信订单新建 · 1092950b
  jinxin authored May 10, 2023
  
  1092950b Browse Files
08 May, 2023 12 commits
- Merge branch 'feature/自建应用验证' into 'master' · ba494dcd
```
test

See merge request !1232
```
  徐高华 authored May 09, 2023
  ba494dcd Browse Files
- test · b3a46aca
  徐高华 authored May 09, 2023
  
  b3a46aca Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 47188c47
```
Feature/自建应用验证

See merge request !1231
```
  徐高华 authored May 09, 2023
  47188c47 Browse Files
- test · 7190720b
  徐高华 authored May 09, 2023
  
  7190720b Browse Files
- test · 4802629a
  徐高华 authored May 09, 2023
  
  4802629a Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 80a7e21d
```
自建关联

See merge request !1229
```
  徐高华 authored May 09, 2023
  80a7e21d Browse Files
- 自建关联 · 6572c3cd
  徐高华 authored May 09, 2023
  
  6572c3cd Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 315abbd3
```
Feature/自建应用验证

See merge request !1227
```
  徐高华 authored May 08, 2023
  315abbd3 Browse Files
- 自建应用不更新统计 · 38e045c7
  徐高华 authored May 08, 2023
  
  38e045c7 Browse Files
- 自建群id · b9120e7e
  徐高华 authored May 08, 2023
  
  b9120e7e Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 16bc5aa8
```
省市区调整

See merge request !1221
```
  徐高华 authored May 08, 2023
  16bc5aa8 Browse Files
- 自建回调过滤 · ee0af121
  徐高华 authored May 08, 2023
  
  ee0af121 Browse Files
05 May, 2023 3 commits
- 消息中心修改 · 7f699535
  zhangzhendong authored May 05, 2023
  
  7f699535 Browse Files
- 消息中心修改 · bc7021ab
  zhangzhendong authored May 05, 2023
  
  bc7021ab Browse Files
- 消息中心修改 · c6b2811f
  zhangzhendong authored May 05, 2023
  
  c6b2811f Browse Files