Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-server-pdm

# Conflicts:
#	src/main/java/com/dk/pdm/service/ProductionRdsService.java

src/main/java/com/dk/pdm/service/ProductionRdsService.java

@@ -1281,7 +1281,6 @@ public class ProductionRdsService extends BaseService<ProductionRds> {
 						throw new BaseBusinessException(modelPdtErpRes.getCode(), modelPdtErpRes.getMessage());
 					}
 				}
-				// todo 暂时不知道为啥有什么用，暂时注释掉
 //				if (modelPdtErpList.stream().noneMatch(n ->
 //						n.get("erpNodeId").equals(it.getErpNodeId()) && n.get("colourId").equals(it.getPdtColourId()) && n.get("logoId").equals(it.getPdtLogoId())
 //				)) {