Commits · 4c2072f19b27846693f76d0570835aca10d5858f · haoban3.0 / haoban-manage3.0

21 Apr, 2023 13 commits
- 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 27 commits
- 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
- feat: 分片写 · be72f9cf
  songyinghui authored Apr 21, 2023
  
  be72f9cf 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
- 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
- api · 87988557
  徐高华 authored Apr 20, 2023
  
  87988557 Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' into developer · d41a9558
  徐高华 authored Apr 20, 2023
  
  d41a9558 Browse Files
- feat: 无用引用 · a85786a2
  songyinghui authored Apr 20, 2023
  
  a85786a2 Browse Files
- 自建 · 004f9adb
  徐高华 authored Apr 20, 2023
  
  004f9adb Browse Files
- test · 94c914ad
  徐高华 authored Apr 20, 2023
  
  94c914ad Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' into developer · 42991069
```
Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java
	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/ClerkMainStoreRelatedServiceImpl.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/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
```
  徐高华 authored Apr 20, 2023
  42991069 Browse Files
- 自建 · 4ec54993
  徐高华 authored Apr 20, 2023
  
  4ec54993 Browse Files
- Merge remote-tracking branch 'origin/feature-content2' into · a0249abd
```
feature/自建应用验证

Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseQwDTO.java
	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 20, 2023
  a0249abd Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 1b205353
  jinxin authored Apr 20, 2023
  
  1b205353 Browse Files
- 操作日志处理 · 747d0925
  jinxin authored Apr 20, 2023
  
  747d0925 Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' into developer · beaa87ee
```
Conflicts:
	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java
```
  徐高华 authored Apr 20, 2023
  beaa87ee Browse Files
- test · f63b1486
  徐高华 authored Apr 20, 2023
  
  f63b1486 Browse Files
- 自建 · ab80b640
  徐高华 authored Apr 20, 2023
  
  ab80b640 Browse Files
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · da8a76c4
  jinxin authored Apr 20, 2023
  
  da8a76c4 Browse Files
- 空指针异常处理 · f133606b
  jinxin authored Apr 20, 2023
  
  f133606b Browse Files
- 自建 · 2281f236
  徐高华 authored Apr 20, 2023
  
  2281f236 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
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · ed275e5a
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderDTO.java
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderPageDTO.java
#	haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderPageVO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/licence/TabHaobanLicenceOrder.java
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java
```
  jinxin authored Apr 20, 2023
  ed275e5a Browse Files