Commits · bugfix_0426_share_time · haoban3.0 / haoban-manage3.0

26 Apr, 2023 4 commits
- feat: 新版图片合成 · 847910eb
  songyinghui authored Apr 26, 2023
  
  847910eb Browse Files
- feat: 新版图片合成 · e9fceca0
  songyinghui authored Apr 26, 2023
  
  e9fceca0 Browse Files
- feat: 图片合成类型 · f445e3c8
  songyinghui authored Apr 26, 2023
  
  f445e3c8 Browse Files
- feat: 分享对象转换 · ebf637b6
  songyinghui authored Apr 26, 2023
  
  ebf637b6 Browse Files
24 Apr, 2023 15 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
- 换门店后,查询主门店 · bf4fb7e2
  徐高华 authored Apr 25, 2023
  
  bf4fb7e2 Browse Files
- Merge branch 'bugfix_0424' into 'master' · 9ac16bb8
```
Bugfix 0424

See merge request !1205
```
  songyinghui authored Apr 24, 2023
  9ac16bb8 Browse Files
- Merge remote-tracking branch 'origin/master' into bugfix_0424 · 7f6227f1
  songyinghui authored Apr 24, 2023
  
  7f6227f1 Browse Files
- Merge branch 'bugfix/2023-04-21' into 'master' · 720c1b9f
```
Bugfix/2023 04 21

See merge request !1204
```
  jinxin authored Apr 24, 2023
  720c1b9f Browse Files
- 如果是小程序解绑，需要存储staffName · cc21817e
  jinxin authored Apr 24, 2023
  
  cc21817e Browse Files
- feat: 周报月报后门 · 11b0d752
  songyinghui authored Apr 24, 2023
  
  11b0d752 Browse Files
- Merge remote-tracking branch 'origin/ferture/四月迭代需求' · 7b79f3a2
```
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
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  徐高华 authored Apr 24, 2023
  7b79f3a2 Browse Files
- / · d56cd354
  徐高华 authored Apr 24, 2023
  
  d56cd354 Browse Files
- / · ba6f0683
  徐高华 authored Apr 24, 2023
  
  ba6f0683 Browse Files
- 过滤回收站的门店 · 8dd59e75
  徐高华 authored Apr 24, 2023
  
  8dd59e75 Browse Files
23 Apr, 2023 6 commits
- Merge branch 'bugfix_multi_area' into 'master' · c9655b79
```
feat: 多商户对一个好办的周报发送情况

See merge request !1197
```
  songyinghui authored Apr 23, 2023
  c9655b79 Browse Files
- feat: 区经品牌名称 · 784bab37
  songyinghui authored Apr 23, 2023
  
  784bab37 Browse Files
- feat: 区经选择问题 · e3b55642
  songyinghui authored Apr 23, 2023
  
  e3b55642 Browse Files
- feat: 多商户对一个好办的周报发送情况 · 16525c02
  songyinghui authored Apr 23, 2023
  
  16525c02 Browse Files
- 过滤非上线门店 · 1957b8ea
  徐高华 authored Apr 23, 2023
  
  1957b8ea Browse Files
- 区经绑定 · 9dd5cd44
  徐高华 authored Apr 23, 2023
  
  9dd5cd44 Browse Files
21 Apr, 2023 3 commits
- Merge branch 'bugfix_memberId_empry_str' into 'master' · 385be9eb
```
feat: 销售线索通知过滤空串

See merge request !1187
```
  songyinghui authored Apr 21, 2023
  385be9eb Browse Files
- feat: 销售线索通知过滤空串 · ee1735c9
  songyinghui authored Apr 21, 2023
  
  ee1735c9 Browse Files
- 操作人名字问题处理 · 35428b39
  jinxin authored Apr 21, 2023
  
  35428b39 Browse Files
20 Apr, 2023 12 commits
- Merge branch 'feature-content2' into 'master' · 5fe4f80c
```
feat: 周报发送逻辑

See merge request !1181
```
  songyinghui authored Apr 21, 2023
  5fe4f80c 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 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-content2' into 'master' · dcbaeb3d
```
Feature content2

See merge request !1176
```
  songyinghui authored Apr 20, 2023
  dcbaeb3d Browse Files
- feat: 无用引用 · a85786a2
  songyinghui authored Apr 20, 2023
  
  a85786a2 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-content2 · 69874815
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageCategoryTypeEnum.java
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/NoticeMessageServiceImpl.java
#	haoban-manage3-wx/pom.xml
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  songyinghui authored Apr 20, 2023
  69874815 Browse Files