# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java

# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/fragment/IpPrintListActivityFragment.java

2、新增賬單小數

# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
#	user-login/src/main/debug/AndroidManifest.xml

2、新增賬單小數