# Conflicts:
#	fill-manager/db/add.sql
#	fill-manager/pom.xml
#	fill-manager/src/main/bin/start.sh
#	fill-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/common/code/ComponentEnum.java
#	fill-manager/src/main/java/com/mortals/xhx/common/code/FieldTypeEnum.java
#	fill-manager/src/main/java/com/mortals/xhx/common/formdesign/DesignComponent.java
#	fill-manager/src/main/java/com/mortals/xhx/common/utils/WordUtil.java
#	fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/dao/AppConfigDao.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/dao/ibatis/AppConfigDaoImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/model/AppConfigEntity.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/model/AppConfigQuery.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppConfigVo.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/service/AppConfigService.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppConfigServiceImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/module/app/web/AppConfigController.java
#	fill-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumInfoFieldEntity.java
#	fill-manager/src/main/java/com/mortals/xhx/module/datum/model/DatumInfoFieldQuery.java
#	fill-manager/src/main/java/com/mortals/xhx/module/datum/service/impl/DatumInfoFieldServiceImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumInfoFieldController.java
#	fill-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
#	fill-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinServiceImpl.java
#	fill-manager/src/main/resources/bootstrap.yml
#	fill-manager/src/main/resources/sqlmap/module/datum/DatumInfoFieldMapper.xml
#	fill-manager/src/test/java/com/mortals/httpclient/http-client.env.json