Commits · 36878d472ca16a012fec915453e819b7db194333 · haoban3.0 / haoban-manage3.0

18 Jan, 2023 16 commits
- Merge branch 'master_118' into 'developer' · 36878d47
```
非空判断

See merge request !891
```
  徐高华 authored Jan 18, 2023
  36878d47 Browse Files
- 非空判断 · 0bf7faa4
  徐高华 authored Jan 18, 2023
  
  0bf7faa4 Browse Files
- Merge branch 'master_118' into 'developer' · 1086ca7c
```
朋友圈

See merge request !890
```
  徐高华 authored Jan 18, 2023
  1086ca7c Browse Files
- 朋友圈 · db5d8c14
  徐高华 authored Jan 18, 2023
  
  db5d8c14 Browse Files
- Merge branch 'master_118' into 'developer' · f6b9eb1b
```
Master 118

See merge request !889
```
  徐高华 authored Jan 18, 2023
  f6b9eb1b Browse Files
- Merge branch 'master_118' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into master_118 · c24f3d6a
  徐高华 authored Jan 18, 2023
  
  c24f3d6a Browse Files
- url · bb7ca1bc
  徐高华 authored Jan 18, 2023
  
  bb7ca1bc Browse Files
- Merge branch 'master_118' into 'developer' · 411110ae
```
朋友圈图片url

See merge request !888
```
  徐高华 authored Jan 18, 2023
  411110ae Browse Files
- Merge branch 'developer' into 'master_118' · 694a1b98
```
# Conflicts:
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/CommonUtil.java
```
  徐高华 authored Jan 18, 2023
  694a1b98 Browse Files
- 朋友圈图片url · 95386260
  徐高华 authored Jan 18, 2023
  
  95386260 Browse Files
- Merge branch 'master_118' into 'developer' · 94bca34b
```
朋友圈

See merge request !887
```
  徐高华 authored Jan 18, 2023
  94bca34b Browse Files
- 朋友圈 · 80b49282
  徐高华 authored Jan 18, 2023
  
  80b49282 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · db0a2775
```
非空判断

See merge request !886
```
  徐高华 authored Jan 18, 2023
  db0a2775 Browse Files
- 非空判断 · 46da83e9
  徐高华 authored Jan 18, 2023
  
  46da83e9 Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · 87663417
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeOrderAccountService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeOrderAccountServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/fee/HaobanQywxFeeOrderService.xml
```
  徐高华 authored Jan 18, 2023
  87663417 Browse Files
- 激活账号 · 669e8990
  徐高华 authored Jan 18, 2023
  
  669e8990 Browse Files
17 Jan, 2023 24 commits
- Merge branch 'feature/获取用户敏感信息' into 'developer' · cabb43f7
```
企微订单查询

See merge request !884
```
  徐高华 authored Jan 17, 2023
  cabb43f7 Browse Files
- 企微订单查询 · ae2d6990
  徐高华 authored Jan 17, 2023
  
  ae2d6990 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 6bb1821e
```
sql

See merge request !883
```
  徐高华 authored Jan 17, 2023
  6bb1821e Browse Files
- sql · 5fe3fc5e
  徐高华 authored Jan 17, 2023
  
  5fe3fc5e Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 75eea26a
```
激活账号

See merge request !882
```
  徐高华 authored Jan 17, 2023
  75eea26a Browse Files
- 激活账号 · 74809c0f
  徐高华 authored Jan 17, 2023
  
  74809c0f Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · ff59d076
```
激活账号

See merge request !881
```
  徐高华 authored Jan 17, 2023
  ff59d076 Browse Files
- 激活账号 · ade9c229
  徐高华 authored Jan 17, 2023
  
  ade9c229 Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · 4d1e57be
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountInterceptLogMapper.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeAccountStaffService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeAccountStaffServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.xml
```
  徐高华 authored Jan 17, 2023
  4d1e57be Browse Files
- 激活账号 · f26d0c94
  徐高华 authored Jan 17, 2023
  
  f26d0c94 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · a595dfee
```
目标跟进接口报错处理

See merge request !879
```
  guojx authored Jan 17, 2023
  a595dfee Browse Files
- 目标跟进接口报错处理 · 27a17ce9
  guojx authored Jan 17, 2023
  
  27a17ce9 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 2c49c07b
```
Feature 2023 01 目标配置

See merge request !878
```
  guojx authored Jan 17, 2023
  2c49c07b Browse Files
- 数据组接口配置错误文案调整 · a0c3f3e8
  guojx authored Jan 17, 2023
  
  a0c3f3e8 Browse Files
- RestResponse统一异常处理 · 80ad8951
  guojx authored Jan 17, 2023
  
  80ad8951 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 3f5cf00a
```
目标跟进数据组接口

See merge request !877
```
  guojx authored Jan 17, 2023
  3f5cf00a Browse Files
- 目标跟进数据组接口 · eeeaccb5
  guojx authored Jan 17, 2023
  
  eeeaccb5 Browse Files
- Merge branch 'feature-2023-01-目标配置' into 'developer' · 7d80d6d5
```
目标跟进数据组接口

See merge request !876
```
  guojx authored Jan 17, 2023
  7d80d6d5 Browse Files
- 目标跟进数据组接口 · 06d8e8dc
  guojx authored Jan 17, 2023
  
  06d8e8dc Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 416e244a
```
已离职成员激活账号

See merge request !875
```
  徐高华 authored Jan 17, 2023
  416e244a Browse Files
- 已离职成员激活账号 · d4c04e2a
  徐高华 authored Jan 17, 2023
  
  d4c04e2a Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 75dca69b
```
log

See merge request !874
```
  徐高华 authored Jan 17, 2023
  75dca69b Browse Files
- log · e7c1dd55
  徐高华 authored Jan 17, 2023
  
  e7c1dd55 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 29bb8dfd
```
Feature/获取用户敏感信息

See merge request !873
```
  徐高华 authored Jan 17, 2023
  29bb8dfd Browse Files