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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

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

@@ -187,6 +187,7 @@
         if(getvalue == null || getvalue === "" || typeof(getvalue) === "undefined"){
             getvalue = "没有问题描述";
         }
+        console.log("-------------"+getvalue);
         $("#questionProfile").html(repalceHtml(getvalue));
 
     }