Merge remote-tracking branch 'origin/master'

jinlin

2024-12-10 a8ce806c8a81f685fa9fafaa453820197ced9961

 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);
}