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_list.ftl

@@ -305,11 +305,11 @@
                                 <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${customer.customerId!''})">
                                     <font color=#06c>详情</font>
                                 </a><br/>
-                                <#--<#if customer.customerIsSolve != 1>-->
+                                <#if customer.customerIsSolve != 1>
                                 <a style="text-decoration:none" href="javascript:void(0);" title="修改客诉" onclick="admin_update_customer(${customer.customerId!''})">
                                     <font color=#06c>修改客诉</font>
                                 </a><br/>
-                                <#--</#if>-->
+                                </#if>
                                 <#if customer.customerIsVisit == "2">
                                     <#if customer.visitStatus == 1 && customer.customerIsVisit == "2">
                                         <a style="text-decoration:none" href="javascript:void(0);" title="已完成回访" onclick="toUpdateVisit(${customer.customerId!''})">