Commits · 4224c85d162321242db3dced613c3b352b4f63a8 · haoban3.0 / haoban-manage3.0

08 May, 2023 3 commits

Merge branch 'feature-消息中心' into test-ct-20230508 · 4224c85d

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java
#	haoban-manage3-service/pom.xml
#	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 08, 2023

4224c85d Browse Files

Merge remote-tracking branch 'origin/master' into test_branch · b9d4d452
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
```
徐高华 authored May 08, 2023
b9d4d452 Browse Files
Merge branch 'ferture/四月迭代需求' into 'master' · 16bc5aa8
```
省市区调整

See merge request !1221
```
徐高华 authored May 08, 2023
16bc5aa8 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
04 May, 2023 12 commits
- test · 39943557
  徐高华 authored May 05, 2023
  
  39943557 Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 78ddb7e7
```
Feature/自建应用验证

See merge request !1217
```
  徐高华 authored May 04, 2023
  78ddb7e7 Browse Files
- 自建 · 555aef3f
  徐高华 authored May 04, 2023
  
  555aef3f Browse Files
- 非空判断 · 4f29e193
  徐高华 authored May 04, 2023
  
  4f29e193 Browse Files
- 删除无效代码 · 2ed6c4f9
  徐高华 authored May 04, 2023
  
  2ed6c4f9 Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' · 90b25c0a
```
Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
```
  徐高华 authored May 04, 2023
  90b25c0a Browse Files
- sql处理 · baf2a439
  jinxin authored May 04, 2023
  
  baf2a439 Browse Files
- 基本类型问题处理 · a567e254
  jinxin authored May 04, 2023
  
  a567e254 Browse Files
- 日志记录 · 715e1d7d
  jinxin authored May 04, 2023
  
  715e1d7d Browse Files
- 省市区调整 · f5331cee
  徐高华 authored May 04, 2023
  
  f5331cee Browse Files
- 判断成员是否开启联系我 · 5b1bc462
  jinxin authored May 04, 2023
  
  5b1bc462 Browse Files
- 判断成员是否开启联系我 · 3fe97247
  jinxin authored May 04, 2023
  
  3fe97247 Browse Files
27 Apr, 2023 6 commits
- Merge branch 'bugfix/2023-04-27' into 'master' · 7d81462e
```
通讯录日志过滤

See merge request !1213
```
  jinxin authored Apr 27, 2023
  7d81462e Browse Files
- 通讯录日志过滤 · c4eac663
  jinxin authored Apr 27, 2023
  
  c4eac663 Browse Files
- Merge branch 'feature/许可账号购买二期' into 'master' · 5a9409be
```
Feature/许可账号购买二期

See merge request !1212
```
  王祖波 authored Apr 27, 2023
  5a9409be Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into test_branch · 1f266af9
  jinxin authored Apr 27, 2023
  
  1f266af9 Browse Files
- 好办消息中心修改 · e4084847
  zhangzhendong authored Apr 27, 2023
  
  e4084847 Browse Files
- 好办消息中心修改 · 730b3361
  zhangzhendong authored Apr 27, 2023
  
  730b3361 Browse Files
26 Apr, 2023 11 commits
- Merge branch 'bugfix_0426_share_time' into test_branch · b50c4961
  root authored Apr 26, 2023
  
  b50c4961 Browse Files
- feat: 新版图片合成 · 847910eb
  songyinghui authored Apr 26, 2023
  
  847910eb Browse Files
- feat: 新版图片合成 · e9fceca0
  songyinghui authored Apr 26, 2023
  
  e9fceca0 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 3e42e9c0
```
群满-待开发的id可能查不到

See merge request !1209
```
  徐高华 authored Apr 26, 2023
  3e42e9c0 Browse Files
- 群满-待开发的id可能查不到 · 11214cab
  徐高华 authored Apr 26, 2023
  
  11214cab Browse Files
- Merge branch 'bugfix_0426_share_time' into test_branch · efff1473
  root authored Apr 26, 2023
  
  efff1473 Browse Files
- feat: 图片合成类型 · f445e3c8
  songyinghui authored Apr 26, 2023
  
  f445e3c8 Browse Files
- 好办消息中心修改 · 45a17047
  zhangzhendong authored Apr 26, 2023
  
  45a17047 Browse Files
- Merge branch 'bugfix_0426_share_time' into test_branch · f88bd79a
  root authored Apr 26, 2023
  
  f88bd79a Browse Files
- feat: 分享对象转换 · ebf637b6
  songyinghui authored Apr 26, 2023
  
  ebf637b6 Browse Files
- 好办消息中心修改 · cd8c4792
  zhangzhendong authored Apr 26, 2023
  
  cd8c4792 Browse Files
24 Apr, 2023 5 commits
- Merge branch 'ferture/四月迭代需求' into 'master' · 9301f3e1
```
设置主门店

See merge request !1208
```
  徐高华 authored Apr 25, 2023
  9301f3e1 Browse Files
- 设置主门店 · 2d276437
  徐高华 authored Apr 25, 2023
  
  2d276437 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 54251f50
```
test

See merge request !1207
```
  徐高华 authored Apr 25, 2023
  54251f50 Browse Files
- test · 2688fbc0
  徐高华 authored Apr 25, 2023
  
  2688fbc0 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 49b6849e
```
换门店后,查询主门店

See merge request !1206
```
  徐高华 authored Apr 25, 2023
  49b6849e Browse Files