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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -313,7 +313,7 @@
                            onclick="add_remark('维修记录','${path}/admin/detect/to_add_content?detectId=${detect.detectId!''}','570','450');">
                             <i class="Hui-iconfont">维修记录</i>
                         </a><br>-->
-                        <#if detect.detectState == 21 ||detect.detectState == 32 || detect.detectState == 36 || detect.detectState == 39>
+                        <#if detect.detectState == 21 ||detect.detectState == 32 || detect.detectState == 36 || detect.detectState == 39|| detect.detectState == 33>
                             <#--<#if detect.maintenanceResults == 2>
                                 <a style="text-decoration:none" href="javascript:;" title="QC检测"
                                    onclick="add_remark('QC检测','${path}/admin/detect/to_add_QC?detectId=${detect.detectId!''}','570','450');">