Merge remote-tracking branch 'origin/master'

xyc

2024-04-26 9ef61aec5e8b218db9d60941ef3ad576a927338b

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/TyProductModelDao.java

@@ -21,5 +21,5 @@

    List<TyProductModel> getProductList();

    Integer getNo(Long pid);
    Integer getNo(Long pid,String nodeType);
}