* commit '807eebdd':
  8小时后台-- 保单在线支付

保单在线支付

Merge branch 'feature_20211213_extension' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop

* 'feature_20211213_extension' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200:
  添加配置文件
  8小时简历助手
  修改员工假期BUG

入职材料

合同页面-列表查询问题

合同页面-已签订
面试登记表详情页面
运营后台--
企业名称重复

2.发送消息接口修改
3.h5服务地址 配置

# Conflicts:
#	src/main/java/cn/timer/api/controller/yggl/YgglController.java

# Conflicts:
#	src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
#	src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
#	src/main/java/cn/timer/api/controller/yggl/YgglController.java
#	src/main/java/cn/timer/api/dao/yggl/YgglMainEmpMapper.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application-test.yml
#	src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

2.入职维护