# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java