# Conflicts:
#   amos-boot-biz-common/.factorypath
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java
#   amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java
#   amos-boot-core/.factorypath
#   amos-boot-data/amos-boot-data-common/.factorypath
#   amos-boot-data/amos-boot-data-openapi/.factorypath
#   amos-boot-module/amos-boot-cloud-gateway/.factorypath
#   amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java
#   amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
#   amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml
#   amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
#   amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
#   amos-boot-system-ccs/.factorypath
#   amos-boot-system-equip/.factorypath
#   amos-boot-system-fas/.factorypath
#   amos-boot-system-jcs/.factorypath
#   amos-boot-system-knowledgebase/.factorypath
#   amos-boot-system-latentdanger/.factorypath
#   amos-boot-system-maintenance/.factorypath
#   amos-boot-system-patrol/.factorypath
#   amos-boot-system-supervision/.factorypath
#   amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/IdxFeignService.java
#   amos-boot-utils/amos-boot-utils-jpush/.factorypath
#   amos-boot-utils/amos-boot-utils-speech/.factorypath
#   amos-boot-utils/amos-boot-utils-video/.factorypath