Commits · 4d1e57bedc7f3a0bf7b25734e6edfd1a1b4114c6 · haoban3.0 / haoban-manage3.0 · GitLab

17 Jan, 2023 32 commits
- 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
- Merge branch 'feature/获取用户敏感信息' of… · e304a3ca
```
Merge branch 'feature/获取用户敏感信息' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/获取用户敏感信息
```
  徐高华 authored Jan 17, 2023
  e304a3ca Browse Files
- 激活账号 · 8b865b12
  徐高华 authored Jan 17, 2023
  
  8b865b12 Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · d4249204
  jinxin authored Jan 17, 2023
  
  d4249204 Browse Files
- 通过userID更新员工二维码 · d3d251f7
  jinxin authored Jan 17, 2023
  
  d3d251f7 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 059829e2
```
激活 账号

See merge request !872
```
  徐高华 authored Jan 17, 2023
  059829e2 Browse Files
- 激活账号 · d0e5d9cd
  徐高华 authored Jan 17, 2023
  
  d0e5d9cd Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · ba933b12
```
激活账号

See merge request !871
```
  徐高华 authored Jan 17, 2023
  ba933b12 Browse Files
- 激活账号 · c709e3c6
  徐高华 authored Jan 17, 2023
  
  c709e3c6 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · baff943d
```
激活账号

See merge request !870
```
  徐高华 authored Jan 17, 2023
  baff943d Browse Files
- 激活账号 · 81ced8a8
  徐高华 authored Jan 17, 2023
  
  81ced8a8 Browse Files
- Merge branch 'feature/获取用户敏感信息' into 'developer' · 26d71992
```
Feature/获取用户敏感信息

See merge request !869
```
  徐高华 authored Jan 17, 2023
  26d71992 Browse Files
- Merge branch 'feature/获取用户敏感信息' of… · d437c666
```
Merge branch 'feature/获取用户敏感信息' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/获取用户敏感信息
```
  徐高华 authored Jan 17, 2023
  d437c666 Browse Files
- 激活账号 · d94f5240
  徐高华 authored Jan 17, 2023
  
  d94f5240 Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · 826b3ef4
  jinxin authored Jan 17, 2023
  
  826b3ef4 Browse Files
- 判断成员是否授权获取敏感信息接口名修改 · 1b406b62
  jinxin authored Jan 17, 2023
  
  1b406b62 Browse Files
- Merge branch 'feature/社群' into 'feature/获取用户敏感信息' · 576b5bdd
```
Feature/社群

See merge request !868
```
  徐高华 authored Jan 17, 2023
  576b5bdd Browse Files
16 Jan, 2023 8 commits
- Merge branch 'feature/社群' into 'developer' · 209f4048
```
会员工具-关联

See merge request !867
```
  徐高华 authored Jan 16, 2023
  209f4048 Browse Files
- 会员工具-关联 · 2093492a
  徐高华 authored Jan 16, 2023
  
  2093492a Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · 9ba264a5
  jinxin authored Jan 16, 2023
  
  9ba264a5 Browse Files
- 回调接口增加返回 · 83b3f8fe
  jinxin authored Jan 16, 2023
  
  83b3f8fe Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · e2296e41
  jinxin authored Jan 16, 2023
  
  e2296e41 Browse Files
- redictUrl替换 · 74a74a18
  jinxin authored Jan 16, 2023
  
  74a74a18 Browse Files
- Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer · 2c7af08a
  jinxin authored Jan 16, 2023
  
  2c7af08a Browse Files
- getWxSuiteid修改 · 7bc2def3
  jinxin authored Jan 16, 2023
  
  7bc2def3 Browse Files