Commits · 76f36682942119926450eb03c35a619031724f32 · haoban3.0 / haoban-manage3.0 · GitLab

05 Jan, 2022 2 commits
- Merge branch 'feature/2022-0104' into developer · 76f36682
  墨竹 authored Jan 05, 2022
  
  76f36682 Browse Files
- fix：加好友修改 · da9bb241
  墨竹 authored Jan 05, 2022
  
  da9bb241 Browse Files
04 Jan, 2022 19 commits
- fix:bug修改 · b37229f3
  墨竹 authored Jan 04, 2022
  
  b37229f3 Browse Files
- fix:bug修改 · 2a723934
  墨竹 authored Jan 04, 2022
  
  2a723934 Browse Files
- fix:bug修改 · 068d8aae
  墨竹 authored Jan 04, 2022
  
  068d8aae Browse Files
- Merge branch 'feature/2022-0104' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · b4f13091
  墨竹 authored Jan 04, 2022
  
  b4f13091 Browse Files
- Merge branch 'feature/2022-0104' into developer · 85e7d1db
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
```
  墨竹 authored Jan 04, 2022
  85e7d1db Browse Files
- refactor：增加钉钉消息 · 2b177dac
  墨竹 authored Jan 04, 2022
  
  2b177dac Browse Files
- Merge branch 'feature/2022-0104' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 2c3c520e
  墨竹 authored Jan 04, 2022
  
  2c3c520e Browse Files
- Merge branch 'feature/2022-0104' into developer · aaab3db4
  墨竹 authored Jan 04, 2022
  
  aaab3db4 Browse Files
- refactor：转换失败状态变化 · a4252645
  墨竹 authored Jan 04, 2022
  
  a4252645 Browse Files
- Merge branch 'feature/2022-0104' into developer · 20146461
  墨竹 authored Jan 04, 2022
  
  20146461 Browse Files
- refactor：增加redis锁 · b4bfa3f9
  墨竹 authored Jan 04, 2022
  
  b4bfa3f9 Browse Files
- Merge branch 'master' into developer · dfed5bdc
  墨竹 authored Jan 04, 2022
  
  dfed5bdc Browse Files
- refactor：加日志 · 52b6b6c5
  墨竹 authored Jan 04, 2022
  
  52b6b6c5 Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 0e78f552
  墨竹 authored Jan 04, 2022
  
  0e78f552 Browse Files
- feat：新增获取员工二维码和openid · 12ddd85b
  墨竹 authored Jan 04, 2022
  
  12ddd85b Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 2b66452b
  墨竹 authored Jan 04, 2022
  
  2b66452b Browse Files
- feat：新增获取员工二维码和openid · e9c1f988
  墨竹 authored Jan 04, 2022
  
  e9c1f988 Browse Files
- Merge branch 'feature/2022-0104' into developer · b6d3dee0
  墨竹 authored Jan 04, 2022
  
  b6d3dee0 Browse Files
- fix：bug修改 · 6d569a98
  墨竹 authored Jan 04, 2022
  
  6d569a98 Browse Files
31 Dec, 2021 2 commits
- Merge branch 'feature/2022-0104' into developer · 2db46dc0
  墨竹 authored Dec 31, 2021
  
  2db46dc0 Browse Files
- feat：新增列表返回转换状态 · c5bab88f
  墨竹 authored Dec 31, 2021
  
  c5bab88f Browse Files
30 Dec, 2021 8 commits
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 137bb03b
  墨竹 authored Dec 30, 2021
  
  137bb03b Browse Files
- Merge branch 'feature-daiban-12-14' into developer · 7616f1fb
  墨竹 authored Dec 30, 2021
  
  7616f1fb Browse Files
- Merge branch 'feature/2022-0104' into developer · 5b086c29
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
```
  墨竹 authored Dec 30, 2021
  5b086c29 Browse Files
- feat：新增转换外部联系人接口和转换外部联系人完成接口 · 7bfdb59a
  墨竹 authored Dec 30, 2021
  
  7bfdb59a Browse Files
- feat:逾期失效查询过滤以及筛选 · f734f942
  fudahua authored Dec 30, 2021
  
  f734f942 Browse Files
- feat:待办新增接口 · dbd0be22
  fudahua authored Dec 30, 2021
  
  dbd0be22 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 1310ae2c
```
feat:逾期失效任务不展示

See merge request !151
```
  fudahua authored Dec 30, 2021
  1310ae2c Browse Files
- feat:逾期失效任务不展示 · 619a0cff
  fudahua authored Dec 30, 2021
  
  619a0cff Browse Files
29 Dec, 2021 9 commits
- Merge branch 'master' into developer · 773c1844
  墨竹 authored Dec 29, 2021
  
  773c1844 Browse Files
- Merge remote-tracking branch 'origin/master' · 326ef050
  墨竹 authored Dec 29, 2021
  
  326ef050 Browse Files
- feat：bug修改 · b3636fa9
  墨竹 authored Dec 29, 2021
  
  b3636fa9 Browse Files
- Merge branch 'feature-daiban-12-14' into 'developer' · 93fe82c4
```
Feature daiban 12 14

See merge request !150
```
  fudahua authored Dec 29, 2021
  93fe82c4 Browse Files
- Merge remote-tracking branch 'origin/feature-daiban-12-14' into feature-daiban-12-14 · 6e3d948f
  fudahua authored Dec 29, 2021
  
  6e3d948f Browse Files
- feat:逾期失效定时处理 · 917c57c9
  fudahua authored Dec 29, 2021
  
  917c57c9 Browse Files
- Merge branch 'feature-dict-mall-order-setting' into developer · 10d2e1e5
  xugaojun authored Dec 29, 2021
  
  10d2e1e5 Browse Files
- [销售管家]：灵活添加提现说明字典，部分写死，不查库 · 481f58a0
  xugaojun authored Dec 29, 2021
  
  481f58a0 Browse Files
- feat：新增根据员工id查询openid接口 · cf9e2d63
  墨竹 authored Dec 29, 2021
  
  cf9e2d63 Browse Files