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/cm/customer/custome_detail.ftl

@@ -217,7 +217,8 @@
             checkboxClass: 'icheckbox-blue',
             radioClass: 'iradio-blue',
             increaseArea: '20%'
-        });
+        });+
+
         $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
             console.log($(this)[0].value);
         //		$("#city2").click()
@@ -355,7 +356,11 @@
                     } else {
                         $('#divCloseProdcue').hide();
                     }
-                    $('#customerTDS').html("<strong>TDS收集:</strong>"+  convertUndefinedToEmpty(customerCommon.relationSendMergeAddress) +",进水"+
+                    var customerArea = "";
+                    if(customer.customerArea != null && customer.customerArea != ""){
+                        customerArea = convertUndefinedToEmpty(customer.customerArea)+",";
+                    }
+                    $('#customerTDS').html("<strong>TDS收集:</strong>"+ customerArea+"进水"+
                             (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
                     if (customer.customerIsVisit == 2) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/view_progress.ftl

@@ -34,7 +34,7 @@
         <div class="input-box">
             <span>签收日期：</span>
             <#if signclosedInfo??>
-                ${(signclosedInfo.signclosedDate?string("yyyy-MM-dd"))!'暂无签收日期'}日
+                ${(signclosedInfo.signclosedDate?string("yyyy-MM-dd"))!'暂无签收日期'}
             <#else >
                 暂无签收日期
             </#if>