Commits · 3d02b61bc66d8681592bb2dc3f946d27ea2d2db5 · 探普后端 / feo-jobs

25 Nov, 2021 2 commits
- Merge remote-tracking branch 'origin/master' into dev · 3d02b61b
  钱坤 authored Nov 25, 2021
  
  3d02b61b
- 同步组织架构时候，若父部门不可见，那么将parentId设置为空串 · 6b3e04a1
  钱坤 authored Nov 25, 2021
  
  6b3e04a1
24 Nov, 2021 1 commit
- 从企微同步人员信息时候记录一下概要，不然像恒泰这样几千人一直在同步的，都不知道具体啥原因 · 5a481232
  钱坤 authored Nov 24, 2021
  
  5a481232
05 Oct, 2021 3 commits
- Merge remote-tracking branch 'origin/bugfix-20211003' into dev · a9deb923
  王亚雷 authored Oct 05, 2021
  
  a9deb923
- Merge remote-tracking branch 'origin/bugfix-20211003' · e7a0f333
  王亚雷 authored Oct 05, 2021
  
  e7a0f333
- 早报文案 · e7a140f6
  王亚雷 authored Oct 05, 2021
  
  e7a140f6
04 Oct, 2021 3 commits
- Merge remote-tracking branch 'origin/bugfix-20211003' into dev · 6e39ac41
  王亚雷 authored Oct 04, 2021
  
  6e39ac41
- Merge remote-tracking branch 'origin/bugfix-20211003' · b4a36e9d
  王亚雷 authored Oct 04, 2021
  
  b4a36e9d
- 早报文案 · 77e0536c
  王亚雷 authored Oct 04, 2021
  
  77e0536c
10 Sep, 2021 6 commits
- Merge branch 'bugfix-20210910' into 'dev' · acfc49dd
  吴泽佳 authored Sep 10, 2021
```
bug修复  员工离职又回来的的问题2

See merge request !17
```
  acfc49dd
- bug修复员工离职又回来的的问题2 · 8a9f219b
  吴泽佳 authored Sep 10, 2021
  
  8a9f219b
- Merge branch 'bugfix-20210910' into 'dev' · c02d768e
  吴泽佳 authored Sep 10, 2021
```
bug修复  员工离职又回来的的问题

See merge request !16
```
  c02d768e
- bug修复员工离职又回来的的问题 · 0441be4a
  吴泽佳 authored Sep 10, 2021
  
  0441be4a
- Merge branch 'master' into dev · fbfdcde3
  钱坤 authored Sep 10, 2021
  
  fbfdcde3
- 升级日志格式，从而可以进入日志收集和监控 · e5fb59a4
  钱坤 authored Sep 10, 2021
  
  e5fb59a4
27 Aug, 2021 3 commits
- 从企微同步组织架构的任务频率调整为半小时检查一次 · b7f5014e
  钱坤 authored Aug 27, 2021
  
  b7f5014e
- Merge remote-tracking branch 'origin/v0.0.1-day-subject' into dev · f5d662af
  钱坤 authored Aug 27, 2021
  
  f5d662af
- Merge remote-tracking branch 'origin/master' into v0.0.1-day-subject · 40ab518f
  钱坤 authored Aug 27, 2021
```
# Conflicts:
#	src/main/java/com/tanpu/feo/feojob/jobs/DaySubJob.java
```
  40ab518f
25 Aug, 2021 6 commits
- Merge remote-tracking branch 'origin/fix-0823-day-subject-url' into dev · 89438057
  钱坤 authored Aug 25, 2021
  
  89438057
- 小程序球码生成失败，增加error日志 · 3ce5a327
  钱坤 authored Aug 25, 2021
  
  3ce5a327
- Merge remote-tracking branch 'origin/fix-0823-day-subject-url' into dev · 8653f87b
  钱坤 authored Aug 25, 2021
  
  8653f87b
- 小程序球码生成失败，增加error日志 · 5f49a7ff
  钱坤 authored Aug 25, 2021
  
  5f49a7ff
- Merge remote-tracking branch 'origin/fix-0823-day-subject-url' into dev · 5dc33111
  钱坤 authored Aug 25, 2021
  
  5dc33111
- 早报推送的链接改为使用重定向地址 · e339efaa
  钱坤 authored Aug 25, 2021
  
  e339efaa
24 Aug, 2021 6 commits
- Merge remote-tracking branch 'origin/dev-08xx-fix-bug' into dev · 25cddd54
  钱坤 authored Aug 24, 2021
  
  25cddd54
- 修正小程序球码生成地址错误问题 · b2d9b8aa
  钱坤 authored Aug 24, 2021
  
  b2d9b8aa
- Merge remote-tracking branch 'origin/dev-08xx-fix-bug' into dev · 4a5ab882
  钱坤 authored Aug 24, 2021
  
  4a5ab882
- qrcodeurl统一从fatools获取 · e40bed47
  钱坤 authored Aug 24, 2021
  
  e40bed47
- qrcodeurl统一从fatools获取 · 8dbc47e7
  钱坤 authored Aug 24, 2021
  
  8dbc47e7
- qrcodeurl统一从fatools获取 · e5f50272
  钱坤 authored Aug 24, 2021
  
  e5f50272
23 Aug, 2021 6 commits
- 短链feignClient参数修正 · 29f9f4da
  钱坤 authored Aug 23, 2021
  
  29f9f4da
- Merge remote-tracking branch 'origin/dev-08xx-fix-bug' into dev · 0f28bec6
  钱坤 authored Aug 23, 2021
  
  0f28bec6
- 早报发送的长链改为短链 · 43cbf4b6
  钱坤 authored Aug 23, 2021
```
新增后门接口强制重发某个机构某日的早报，
```
  43cbf4b6
- 早报优化 · 28e8826e
  吴泽佳 authored Aug 23, 2021
  
  28e8826e
- Merge remote-tracking branch 'origin/dev-08xx-fix-bug' into dev · cc9f3924
  钱坤 authored Aug 23, 2021
  
  cc9f3924
- 早报发送的长链改为短链 · 9c49ccf5
  钱坤 authored Aug 23, 2021
```
新增后门接口强制重发某个机构某日的早报，
```
  9c49ccf5
19 Aug, 2021 2 commits
- Merge branch 'dev-0811-short-video' into 'dev' · 901c8e24
  张辰 authored Aug 19, 2021
```
短视频同步

See merge request !15
```
  901c8e24
- 短视频同步 · 21f266a2
  张辰 authored Aug 19, 2021
  
  21f266a2
18 Aug, 2021 1 commit
- 从企微同步组织架构改为1小时一次 · e0a56e9f
  钱坤 authored Aug 18, 2021
  
  e0a56e9f
17 Aug, 2021 1 commit
- Merge branch 'dev-0811-short-video' into 'dev' · 39ee25d0
  张辰 authored Aug 17, 2021
```
短视频

See merge request !14
```
  39ee25d0