# Conflicts:
#	src/main/java/cn/timer/api/bean/qyxx/CmsContentModular.java
#	src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
#	src/main/java/cn/timer/api/controller/LoginController.java
#	src/main/java/cn/timer/api/controller/insure/InsureContorll.java
#	src/main/java/cn/timer/api/controller/qyxx/CmsController.java
#	src/main/java/cn/timer/api/dao/qyxx/CmsContentMapper.java
#	src/main/resources/application-pro.yml
#	src/main/resources/application.yml