熊小夕打印。

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -339,7 +339,7 @@
                 <div class="formControls col-2 col-sm-2" style="width: 10%">
                     <input type="button" class="btn btn-primary" value="发送问题回复给用户" onclick="sendPhone('p','p-msg');">
                 </div>
-                <div class="formControls col-2 col-sm-2" style="width: 10%;    margin-left: 40px;">
+                <div class="formControls col-2 col-sm-2" style="width: 10%;    margin-left: 40px;display: none">
                     <input type="button" class="btn btn-primary" value="保存QA" onclick="saveQuestion(1);">
                 </div>
                 <div class="formControls col-2 col-sm-2 msg-phone">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -319,7 +319,7 @@
                 <div class="formControls col-2 col-sm-2" style="width: 10%">
                     <input type="button" class="btn btn-primary" value="发送问题回复给用户" onclick="sendPhone('p','p-msg');">
                 </div>
-                <div class="formControls col-2 col-sm-2" style="width: 10%;    margin-left: 40px;">
+                <div class="formControls col-2 col-sm-2" style="width: 10%;    margin-left: 40px;display: none">
                     <input type="button" class="btn btn-primary" value="保存QA" onclick="saveQuestion();">
                 </div>
                 <div class="formControls col-2 col-sm-2 msg-phone">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -423,7 +423,7 @@
                                 var barcodes2 = $("#bcTarget").html();
                                 $("#printlist").append(
                                     '<div style="width: 243px;height: 120px;position: relative;">' +
-                                    '<span style="padding-left: 10px;">熊小夕F10净饮机矿泉版</span>' +
+                                    '<span style="padding-left: 10px;">即热台式净饮机 矿泉版</span>' +
                                     /* '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
                                      '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +*/
                                     '<div style="position: absolute;padding-top: 25px;" id="bcTarget2" class="barcodeImg">'+barcodes2+'</div>' +