# Conflicts:
#	ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/TravelConfigPersonController.java
#	ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/TravelConfigPersonVo.java
#	ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TravelConfigPersonServiceImpl.java