# Conflicts: # haoban-manage3-service/pom.xml
test See merge request !1293
test See merge request !1292