Commits · 9b21ef0a1f484fbfc4463acf12fc7a49fa5bf3f5 · haoban3.0 / haoban-manage3.0 · GitLab

21 Dec, 2021 31 commits
- Merge branch 'feature/login-token' into developer · 9b21ef0a
  墨竹 authored Dec 21, 2021
  
  9b21ef0a Browse Files
- fix：bug修改 · bb294ddc
  墨竹 authored Dec 21, 2021
  
  bb294ddc Browse Files
- Merge branch 'feature/login-token' into developer · 52585cf4
  墨竹 authored Dec 21, 2021
  
  52585cf4 Browse Files
- fix：登录兼容 · afc23ea3
  墨竹 authored Dec 21, 2021
  
  afc23ea3 Browse Files
- Merge branch 'feature/login-token' into developer · 159d37b3
  墨竹 authored Dec 21, 2021
  
  159d37b3 Browse Files
- fix：登录兼容 · c29c53a5
  墨竹 authored Dec 21, 2021
  
  c29c53a5 Browse Files
- Merge branch 'feature/login-token' into developer · e259b692
  墨竹 authored Dec 21, 2021
  
  e259b692 Browse Files
- fix：wx_open_user_id修改 · e62a7c57
  墨竹 authored Dec 21, 2021
  
  e62a7c57 Browse Files
- Merge branch 'feature/login-token' into developer · 404d0370
  墨竹 authored Dec 21, 2021
  
  404d0370 Browse Files
- fix：wx_open_user_id修改 · 551d95db
  墨竹 authored Dec 21, 2021
  
  551d95db Browse Files
- Merge branch 'feature/login-token' into developer · 2ab1e84e
  墨竹 authored Dec 21, 2021
  
  2ab1e84e Browse Files
- fix：wx_open_user_id修改 · 4281d7c2
  墨竹 authored Dec 21, 2021
  
  4281d7c2 Browse Files
- Merge branch 'feature/login-token' into developer · 87862576
  墨竹 authored Dec 21, 2021
  
  87862576 Browse Files
- fix：list修改 · 58740f6d
  墨竹 authored Dec 21, 2021
  
  58740f6d Browse Files
- Merge branch 'feature/login-token' into developer · b1b60114
  墨竹 authored Dec 21, 2021
  
  b1b60114 Browse Files
- fix：判断空 · b0bfc9f3
  墨竹 authored Dec 21, 2021
  
  b0bfc9f3 Browse Files
- Merge branch 'feature/login-token' into developer · 2b2840ca
  墨竹 authored Dec 21, 2021
  
  2b2840ca Browse Files
- fix：判断空 · 37226b28
  墨竹 authored Dec 21, 2021
  
  37226b28 Browse Files
- Merge branch 'feature/login-token' into developer · c308eb86
  墨竹 authored Dec 21, 2021
  
  c308eb86 Browse Files
- feat：增加微信userid转换 · 245b9025
  墨竹 authored Dec 21, 2021
  
  245b9025 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ca44c503
  墨竹 authored Dec 21, 2021
  
  ca44c503 Browse Files
- Merge branch 'feature/login-token' into developer · 60eb6a41
  墨竹 authored Dec 21, 2021
  
  60eb6a41 Browse Files
- feat：增加微信userid转换 · 0935869c
  墨竹 authored Dec 21, 2021
  
  0935869c Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 59431e47
```
消息推送

See merge request !144
```
  fudahua authored Dec 21, 2021
  59431e47 Browse Files
- 消息推送 · 88071e54
  fudahua authored Dec 21, 2021
  
  88071e54 Browse Files
- Merge branch 'feature/login-token' into developer · 6e4af768
  墨竹 authored Dec 21, 2021
  
  6e4af768 Browse Files
- fix：保存联系人key修改，先去除校验 · c9d7d331
  墨竹 authored Dec 21, 2021
  
  c9d7d331 Browse Files
- fix：merge · 885cb87e
  墨竹 authored Dec 21, 2021
  
  885cb87e Browse Files
- Merge branch 'feature/login-token' into developer · 509bfb0a
```
# Conflicts:
#	haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
```
  墨竹 authored Dec 21, 2021
  509bfb0a Browse Files
- fix：企微授权bug修改 · 36c7a320
  墨竹 authored Dec 21, 2021
  
  36c7a320 Browse Files
- fix：tab_haoban_wx_application增加字段 · 88ec5ba1
  墨竹 authored Dec 21, 2021
  
  88ec5ba1 Browse Files
20 Dec, 2021 9 commits
- Merge branch 'feature/login-token' into developer · 00fb2c44
  墨竹 authored Dec 20, 2021
  
  00fb2c44 Browse Files
- fix：企微微信授权修改 · a8b75126
  墨竹 authored Dec 20, 2021
  
  a8b75126 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 844ac7e1
```
待办信息

See merge request !143
```
  fudahua authored Dec 20, 2021
  844ac7e1 Browse Files
- 待办信息 · 01c3b6b3
  fudahua authored Dec 20, 2021
  
  01c3b6b3 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · b047822d
```
消息分页

See merge request !142
```
  fudahua authored Dec 20, 2021
  b047822d Browse Files
- 消息分页 · 02a7c58e
  fudahua authored Dec 20, 2021
  
  02a7c58e Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 488da98e
```
好友会员数量以及关联数量

See merge request !141
```
  fudahua authored Dec 20, 2021
  488da98e Browse Files
- 好友会员数量以及关联数量 · 11db84a0
  fudahua authored Dec 20, 2021
  
  11db84a0 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 8ce9fece
  墨竹 authored Dec 20, 2021
  
  8ce9fece Browse Files