Merge remote-tracking branch 'origin/master'

xyc

2024-04-26 9ef61aec5e8b218db9d60941ef3ad576a927338b

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

@@ -22,7 +22,7 @@
    List<XhProductModel> getList(Map<String, Object> params);


    Integer getNo(Long pid);
    Integer getNo(Long pid, String productType);

    List<XhProductModel> getProductList();