Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

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

@@ -479,8 +479,8 @@
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                        <select name="initCityCode" class="select" id="initCity<#--TDSArea-->" <#--name="TDSArea"-->>
-                            <option value="">请选择城市<#--请搜索城市--></option>
+                        <select name="initCityCode" class="select" id="initCity">
+                            <option value="">请选择城市</option>
                         </select>
                     </span>
                 </div>
@@ -492,10 +492,10 @@
 				    </span>
                  </div>
                 <input type="hidden" name="customerArea" id="customerArea">
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-1 col-sm-1">
                     <input type="text" class="input-text" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-1 col-sm-1">
                     <input type="text" class="input-text" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
             </div>

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

@@ -618,10 +618,10 @@
 				</span>
                 </div>-->
                 <input type="hidden" name="customerArea" id="customerArea" value="${customerInfo.customerArea!''}">
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-1 col-sm-1">
                     <input type="text" class="input-text" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-1 col-sm-1">
                     <input type="text" class="input-text" value="${customerInfo.customerOutTDS!'0'}" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
             </div>