Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/HP/SC/HPSC002.js

@@ -84,7 +84,7 @@ $(function () {
                 ei.set("inqu_status-0-prdtType",$("#inqu_status-0-prdtType").val());
                 ei.set("inqu_status-0-prdtCode",$("#inqu_status-0-prdtCode").val());
                 ei.set("inqu_status-0-status",$("#inqu_status-0-status").val());
-                ei.set("inqu_status-0-projCode",projCode? projCode : strs[1]);
+                ei.set("inqu_status-0-parentId",parentId? parentId : strs[1]);
                 // ei.set("inqu_status-0-parentId",-1);
 
                 return ei;