Commits · d92c56b5575d2ba68bdba3897c7542a0a744c03e · haoban3.0 / haoban-manage3.0 · GitLab

22 Jan, 2022 11 commits
- feat：加好友dingding报警，时间延长 · d92c56b5
  墨竹 authored Jan 22, 2022
  
  d92c56b5 Browse Files
- feat：删除无效代码 · 2fd5ef3e
  墨竹 authored Jan 22, 2022
  
  2fd5ef3e Browse Files
- feat：删除无效代码，优化加好友代码逻辑 · 1620c362
  墨竹 authored Jan 22, 2022
  
  1620c362 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · bc29dccd
  墨竹 authored Jan 22, 2022
  
  bc29dccd Browse Files
- feat：加好友增加判断逻辑 · 2b196895
  墨竹 authored Jan 22, 2022
  
  2b196895 Browse Files
- feat：增加打印日志 · e7826360
  墨竹 authored Jan 22, 2022
  
  e7826360 Browse Files
- feat：增加打印日志 · c1e474a7
  墨竹 authored Jan 22, 2022
  
  c1e474a7 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · bbd2eb54
  xugaojun authored Jan 22, 2022
  
  bbd2eb54 Browse Files
- 修复一个线上bug,说明字典Bug · c314aced
  xugaojun authored Jan 22, 2022
  
  c314aced Browse Files
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 2841e0ee
  墨竹 authored Jan 22, 2022
  
  2841e0ee Browse Files
- fix:保存任务信息 · 4e19484e
  fudahua authored Jan 22, 2022
  
  4e19484e Browse Files
21 Jan, 2022 4 commits
- Merge branch 'developer' into 'master' · 3d351154
```
Developer

See merge request !157
```
  fudahua authored Jan 21, 2022
  3d351154 Browse Files
- fix:上传 · a437b217
  fudahua authored Jan 21, 2022
  
  a437b217 Browse Files
- feat:上传日志 · 705edc37
  fudahua authored Jan 21, 2022
  
  705edc37 Browse Files
- feat:上传日志 · 0fc02905
  fudahua authored Jan 21, 2022
  
  0fc02905 Browse Files
20 Jan, 2022 25 commits
- Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 252dc878
  墨竹 authored Jan 21, 2022
  
  252dc878 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 57685019
  墨竹 authored Jan 21, 2022
  
  57685019 Browse Files
- Merge branch 'developer' into 'master' · 03853f9d
```
feat:更新

See merge request !156
```
  fudahua authored Jan 21, 2022
  03853f9d Browse Files
- feat:更新 · 83759fbf
  fudahua authored Jan 21, 2022
  
  83759fbf Browse Files
- Merge branch 'developer' into 'master' · a7af3f65
```
feat:好友

See merge request !155
```
  fudahua authored Jan 21, 2022
  a7af3f65 Browse Files
- feat:好友 · d905a993
  fudahua authored Jan 21, 2022
  
  d905a993 Browse Files
- Merge branch 'developer' into 'master' · aec6d223
```
feat:任务

See merge request !154
```
  fudahua authored Jan 21, 2022
  aec6d223 Browse Files
- feat:任务 · 284418a4
  fudahua authored Jan 21, 2022
  
  284418a4 Browse Files
- feat：common提前 · f08cb979
  墨竹 authored Jan 21, 2022
  
  f08cb979 Browse Files
- feat：common提前 · 381398f9
  墨竹 authored Jan 21, 2022
  
  381398f9 Browse Files
- feat：common提前 · 5418fa6a
  墨竹 authored Jan 21, 2022
  
  5418fa6a Browse Files
- Merge remote-tracking branch 'origin/master' · 224de632
  墨竹 authored Jan 20, 2022
  
  224de632 Browse Files
- feat：删除无效pom · 130d1972
  墨竹 authored Jan 20, 2022
  
  130d1972 Browse Files
- Merge branch 'developer' into 'master' · 266ef4f4
```
feat:任务

See merge request !153
```
  fudahua authored Jan 20, 2022
  266ef4f4 Browse Files
- feat:任务 · 0e138093
  fudahua authored Jan 20, 2022
  
  0e138093 Browse Files
- Merge branch 'developer' into 'master' · 0693fa5c
```
feat:失效

See merge request !152
```
  fudahua authored Jan 20, 2022
  0693fa5c Browse Files
- feat:失效 · 61d6b020
  fudahua authored Jan 20, 2022
  
  61d6b020 Browse Files
- feat：删除无效pom · 093822ca
  墨竹 authored Jan 20, 2022
  
  093822ca Browse Files
- feat：删除无效代码 · 065c94d3
  墨竹 authored Jan 20, 2022
  
  065c94d3 Browse Files
- feat：删除无效代码 · 96f25a3a
  墨竹 authored Jan 20, 2022
  
  96f25a3a Browse Files
- Merge branch 'master' into developer · 0c91160c
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
```
  墨竹 authored Jan 20, 2022
  0c91160c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e7e49843
  墨竹 authored Jan 20, 2022
  
  e7e49843 Browse Files
- feat：企微授权修改 · 3730696d
  墨竹 authored Jan 20, 2022
  
  3730696d Browse Files
- 新增客户领券-跳转客户想起pageType · 11827ffa
  xugaojun authored Jan 20, 2022
  
  11827ffa Browse Files
- feat：跳过登录修改 · 1d3e256a
  墨竹 authored Jan 20, 2022
  
  1d3e256a Browse Files