Commits · cc27c527a410b33199a89940a0f2f31d016a1275 · fangxinjiang / yifu-mvp

26 Aug, 2022 28 commits
- 申报修改 · cc27c527
  huyuchen authored Aug 26, 2022
  
  cc27c527
- 申报修改 · 5473fed4
  huyuchen authored Aug 26, 2022
  
  5473fed4
- 申报修改 · b20b4ed3
  huyuchen authored Aug 26, 2022
  
  b20b4ed3
- 稿酬导入修改 · ca438a8b
  huyuchen authored Aug 26, 2022
  
  ca438a8b
- Merge remote-tracking branch 'origin/develop' into develop · 5157b61f
  huyuchen authored Aug 26, 2022
  
  5157b61f
- 稿酬导入修改 · 09002306
  huyuchen authored Aug 26, 2022
  
  09002306
- Merge branch 'feature-zhaji' into 'develop' · b5187ce0
  查济 authored Aug 26, 2022
```
Feature zhaji

See merge request fangxinjiang/yifu!197
```
  b5187ce0
- Merge branch 'develop' into feature-zhaji · d901252d
  zhaji authored Aug 26, 2022
  
  d901252d
- "feature-zhaJi:ekp数据源增加，调整各个环节代码的包路径" · 85da8e24
  zhaji authored Aug 26, 2022
  
  85da8e24
- Merge remote-tracking branch 'origin/develop' into develop · f1b5b3e8
  huyuchen authored Aug 26, 2022
  
  f1b5b3e8
- 稿酬导入修改 · 96796111
  huyuchen authored Aug 26, 2022
  
  96796111
- Merge remote-tracking branch 'origin/develop' into develop · ef20be85
  fangxinjiang authored Aug 26, 2022
  
  ef20be85
- BUG修复 · 92f86cc7
  fangxinjiang authored Aug 26, 2022
  
  92f86cc7
- 稿酬导入修改 · 658d41f0
  huyuchen authored Aug 26, 2022
  
  658d41f0
- 稿酬导入修改 · fe4d0a4f
  huyuchen authored Aug 26, 2022
  
  fe4d0a4f
- Merge remote-tracking branch 'origin/develop' into develop · 1393bede
  hongguangwu authored Aug 26, 2022
  
  1393bede
- 文本超长 · c0846036
  hongguangwu authored Aug 26, 2022
  
  c0846036
- 稿酬导入修改 · fbe4974c
  huyuchen authored Aug 26, 2022
  
  fbe4974c
- 稿酬导入修改 · a543d938
  huyuchen authored Aug 26, 2022
  
  a543d938
- Merge remote-tracking branch 'origin/develop' into develop · e329bf78
  huyuchen authored Aug 26, 2022
  
  e329bf78
- 稿酬导入修改 · df8f8048
  huyuchen authored Aug 26, 2022
  
  df8f8048
- Merge branch 'feature-licancan' into 'develop' · f555341d
  李灿灿 authored Aug 26, 2022
```
Feature licancan

See merge request fangxinjiang/yifu!196
```
  f555341d
- Merge branch 'develop' into feature-licancan · a064a4d2
  李灿灿 authored Aug 26, 2022
  
  a064a4d2
- 周岁工具类调整 · 7727d7a4
  李灿灿 authored Aug 26, 2022
  
  7727d7a4
- Merge remote-tracking branch 'origin/develop' into develop · ec71999d
  hongguangwu authored Aug 26, 2022
  
  ec71999d
- 优化时间等 · 25d05b5d
  hongguangwu authored Aug 26, 2022
  
  25d05b5d
- 稿酬导入修改 · d221d4d6
  huyuchen authored Aug 26, 2022
  
  d221d4d6
- 稿酬导入修改 · 34293e49
  huyuchen authored Aug 26, 2022
  
  34293e49
25 Aug, 2022 12 commits
- Merge remote-tracking branch 'origin/develop' into develop · 2209c6b3
  hongguangwu authored Aug 25, 2022
  
  2209c6b3
- relaySalarySum = relaySalarySum.add(sai.getSalaryMoney()); · a43aedad
  hongguangwu authored Aug 25, 2022
  
  a43aedad
- Merge remote-tracking branch 'origin/develop' into develop · fc4fa1fc
  fangxinjiang authored Aug 25, 2022
  
  fc4fa1fc
- BUG修复 · cbcc250c
  fangxinjiang authored Aug 25, 2022
  
  cbcc250c
- Merge branch 'feature-zhaji' into 'develop' · 7e4fe0db
  查济 authored Aug 25, 2022
```
"feature-zhaJi:优化减员办理操作日志"

See merge request fangxinjiang/yifu!195
```
  7e4fe0db
- "feature-zhaJi:优化减员办理操作日志" · 335cfa14
  zhaji authored Aug 25, 2022
  
  335cfa14
- Merge branch 'feature-zhaji' into 'develop' · 2b7c509c
  查济 authored Aug 25, 2022
```
Feature zhaji

See merge request fangxinjiang/yifu!194
```
  2b7c509c
- Merge branch 'develop' into feature-zhaji · 0443938c
  zhaji authored Aug 25, 2022
  
  0443938c
- "feature-zhaJi:优化减员退回bug" · ec3e9b30
  zhaji authored Aug 25, 2022
  
  ec3e9b30
- relaySalarySum = relaySalarySum.add(sai.getSalaryMoney()); · b5958210
  hongguangwu authored Aug 25, 2022
  
  b5958210
- 薪资特殊值，过滤劳务费、稿酬类型 · 05097a1d
  hongguangwu authored Aug 25, 2022
  
  05097a1d
- Merge remote-tracking branch 'origin/develop' into develop · 84dba00e
  hongguangwu authored Aug 25, 2022
  
  84dba00e