Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-web/src/main/resources/platform.properties

@@ -84,4 +84,4 @@ SUCCESSINFO=SUCCESS
 
 #cm-website-send-msg
 website=https://rst.iamberry.com/QA
-scanningQrCode=https://w.iamberry.com/iamberry/wechat/qrCode/scanningQrCode?barCode=
+scanningQrCode=https://w.iamberry.com/tooth/wechat/qr/