# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RiceponAddOrderBean.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java