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/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl

@@ -308,10 +308,11 @@
 
             //单个打印条形码
              function barCodePrint(barCode,machineId){
+
                  var  machineBarcode = barCode;
                  var machineQrcode = $("#machineQrcode"+machineId).val();
-                     $("#printlist").append('<div style="width: 420px;height: 180px;position: relative;">'+
-                             '<img style="position: absolute;float: left; width: 170px;height: 170px;" src="'+machineQrcode+'" />'+
+                     $("#printlist").append('<div style="width: 138px; height: 100px;position: relative;margin-bottom: 4px;">'+
+                             '<img style="position: absolute;float: left; width: 55px;height: 55px;" src="'+machineQrcode+'" />'+
                              '</div>');
                      if(${machineIsPrint} == '1')
                      {