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

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java

@@ -247,6 +247,7 @@ public class ServiceHPSC001 extends ServiceBase {
             hpsc002.put("icon", "");
             hpsc002.put("prdtCode", hpsc001.getProjCode());
             hpsc002.put("prdtName", hpsc001.getProjName());
+            hpsc002.put("depCode", hpsc001.getDepCode());
             rows.add(hpsc002);
         }
         eiBlock.setRows(rows);

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -251,6 +251,7 @@ public class ServiceHPSC003 extends ServiceBase {
 		newSc005.setFilePath1(dbSc004.getFilePath1());
 		newSc005.setMatId(dbSc004.getMatId());
 		newSc005.setStatus(CommonConstant.YesNo.NO_0);
+		newSc005.setDepCode(dbSc004.getDepCode());
 		DaoUtils.insert(HPSC005.INSERT, newSc005);
 		return newSc005;
 	}