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-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintDetectInfoMapper.xml

@@ -61,7 +61,7 @@
       cd.detect_date detectDate,
       cd.product_color_id productColorId,
       qd.describe_title questionTitle,
-    pt.type_name productName,
+      pt.type_name productTypeName,
       cd.maintenance_results maintenanceResults
     from tb_rst_complaint_detect cd
         LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id