src/main/resources/application-pro.yml · a1a031a6198fbf223529c216b3e77f860b61c4d1 · 8timerv2 / 8timerapiv200

Merge remote-tracking branch 'origin/feature_20220317_policy' into develop · a1a031a6

# 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

committed Apr 18, 2022

a1a031a6

application-pro.yml 10.2 KB