# Conflicts: # src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java # src/main/java/cn/timer/api/controller/insure/InsureContorll.java # src/main/java/cn/timer/api/utils/HttpUtils.java # src/main/resources/application-pro.yml # src/main/resources/application.yml
