Commits · 39fd513cdd8ce44e77a8ad9620dd140dd1bb23bc · fangxinjiang / yifu-mvp

25 Jul, 2022 6 commits
- 派单详情& 获取合同远程接口 & 审核记录新增标题和部门 · 39fd513c
  fangxinjiang authored Jul 25, 2022
  
  39fd513c
- 派单处理 · 1a8911c9
  fangxinjiang authored Jul 25, 2022
  
  1a8911c9
- Merge remote-tracking branch 'origin/develop' into develop · 0b3bad94
  fangxinjiang authored Jul 25, 2022
  
  0b3bad94
- 派单处理 · ed7932dd
  fangxinjiang authored Jul 25, 2022
  
  ed7932dd
- Merge remote-tracking branch 'origin/develop' into develop · 40856258
  hongguangwu authored Jul 25, 2022
  
  40856258
- 合同变更-仅作废之前选的合同 · fcad5961
  hongguangwu authored Jul 25, 2022
  
  fcad5961
23 Jul, 2022 2 commits
- 合同待办处理 · b08bd8c2
  fangxinjiang authored Jul 23, 2022
  
  b08bd8c2
- 合同待办处理 · 4bc7d3d1
  fangxinjiang authored Jul 23, 2022
  
  4bc7d3d1
22 Jul, 2022 15 commits
- Merge remote-tracking branch 'origin/develop' into develop · 9e9c8458
  fangxinjiang authored Jul 22, 2022
  
  9e9c8458
- 社保公积金批量新增 · cbbb465d
  fangxinjiang authored Jul 22, 2022
  
  cbbb465d
- 合同变更-仅作废之前选的合同 · c660337b
  hongguangwu authored Jul 22, 2022
  
  c660337b
- Merge remote-tracking branch 'origin/develop' into develop · c1b4fdb2
  fangxinjiang authored Jul 22, 2022
  
  c1b4fdb2
- dapr配置 · 2a9e25e1
  fangxinjiang authored Jul 22, 2022
  
  2a9e25e1
- Merge branch 'feature-licancan' into 'develop' · a0fd01aa
  李灿灿 authored Jul 22, 2022
```
Feature licancan

See merge request fangxinjiang/yifu!28
```
  a0fd01aa
- 报错调试 · 8f07355f
  李灿灿 authored Jul 22, 2022
  
  8f07355f
- 报错调试 · 95588c6d
  李灿灿 authored Jul 22, 2022
  
  95588c6d
- 批量新增导入 · 351e02db
  fangxinjiang authored Jul 22, 2022
  
  351e02db
- 优化，别弄掉了 · ce78bcad
  hongguangwu authored Jul 22, 2022
  
  ce78bcad
- 优化，别弄掉了 · 2a09e5c9
  hongguangwu authored Jul 22, 2022
  
  2a09e5c9
- fdd 代码修改 · af2f9239
  huyuchen authored Jul 22, 2022
  
  af2f9239
- fdd 代码修改 · 0a3cdcf5
  huyuchen authored Jul 22, 2022
  
  0a3cdcf5
- 批量新增导入 · e8f3456c
  fangxinjiang authored Jul 22, 2022
  
  e8f3456c
- 批量新增导入 · dcd36e19
  fangxinjiang authored Jul 22, 2022
  
  dcd36e19
21 Jul, 2022 17 commits
- 批量新增导入 · c1d6ca0e
  fangxinjiang authored Jul 21, 2022
  
  c1d6ca0e
- 批量新增导入 · 0d71114b
  fangxinjiang authored Jul 21, 2022
  
  0d71114b
- 批量新增导入 · d4c51d02
  fangxinjiang authored Jul 21, 2022
  
  d4c51d02
- Merge remote-tracking branch 'origin/develop' into develop · ec08c706
  fangxinjiang authored Jul 21, 2022
```
# Conflicts:
#	yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
```
  ec08c706
- Merge branch 'feature-zhaji' into 'develop' · 0170e2ac
  查济 authored Jul 21, 2022
```
"feature-zhaJi:新增商险减员办理，查询列表，导出列表接口"

See merge request fangxinjiang/yifu!27
```
  0170e2ac
- 批量新增导入 · eb0c5001
  fangxinjiang authored Jul 21, 2022
  
  eb0c5001
- "feature-zhaJi:新增商险减员办理，查询列表，导出列表接口" · 21734172
  zhaji authored Jul 21, 2022
  
  21734172
- fdd 代码修改 · 2b1fb524
  huyuchen authored Jul 21, 2022
  
  2b1fb524
- Merge remote-tracking branch 'origin/develop' into develop · b2f7b4c9
  huyuchen authored Jul 21, 2022
  
  b2f7b4c9
- fdd 代码修改 · afafb123
  huyuchen authored Jul 21, 2022
  
  afafb123
- Merge branch 'feature-licancan' into 'develop' · e47165bd
  李灿灿 authored Jul 21, 2022
```
登记保单保费

See merge request fangxinjiang/yifu!26
```
  e47165bd
- 登记保单保费 · 1ef42e3e
  李灿灿 authored Jul 21, 2022
  
  1ef42e3e
- 远程接口，时间转化失败，加上注解 · 73770550
  hongguangwu authored Jul 21, 2022
  
  73770550
- Merge remote-tracking branch 'origin/develop' into develop · fbc7479d
  hongguangwu authored Jul 21, 2022
  
  fbc7479d
- 合同相关\社保公积金相关 · c370753b
  hongguangwu authored Jul 21, 2022
  
  c370753b
- Merge branch 'feature-licancan' into 'develop' · c3b813a4
  李灿灿 authored Jul 21, 2022
```
商险结算表实体类修改

See merge request fangxinjiang/yifu!25
```
  c3b813a4
- 商险结算表实体类修改 · 42c1b071
  李灿灿 authored Jul 21, 2022
  
  42c1b071