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-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -88,6 +88,10 @@ public class ResultInfo {
 	 */
 	public static String PARTS_EXCEL= "/common/images/uploadExcel";
 	/**
+	 * 生成电动牙刷二维码保存路径
+	 */
+	public static String QRCODE_TOOTH_IMAGE= "/common/images/pts/toothImages/";
+	/**
 	 * 订单发货的界面
 	 */
 	public static String PAGE_SHIPMENT = "";