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

@@ -97,7 +97,7 @@
 			<input type="hidden" value="${machineId!''}" name="machineId" id="machineId">
             <input type="hidden" value="" name="codeId" id="codeId">
             <div style="position: absolute;top: 80px;height: 23px;display:none;" id="bcTarget" class="barcodeImg"></div>
-			<div  <#--style="display:none;"--> >
+			<div  style="display:none;" >
 				<div id="printlist" style="margin-left: 75px;">
                 </div>
 			</div>
@@ -198,13 +198,13 @@
                     layer.msg('一次最多支持打印24张条形码', {icon: 2, time: 2000});
                 }else */if (prints != ""){
                     $("#printlist").printArea();
-                    /*$("#printlist").html("");*/
+                    $("#printlist").html("");
                     layer.closeAll();
                 } else {
                     layer.msg('未选中需要打印的条形码', {icon: 2, time: 2000});
                 }
 
-                /*$("#printlist").html("");  //未打印成功，需要清除数据*/
+                $("#printlist").html("");  //未打印成功，需要清除数据
                 prints = "";
             }
             //动态刷新是否有最新的机器