Merge remote-tracking branch 'origin/master'

xyc

2024-05-08 563640b16778af6a281ed9417e2dcbed0ba5aa54

 modules/mainPart/src/main/resources/mapper/basicInfo/TyProductModelDao.xml

@@ -30,6 +30,8 @@
        from product_model_common a
        where a.is_delete = 0
          and a.node_type <> 1
        ORDER BY
            node_type,sort
    </select>
    <select id="getNo" resultType="java.lang.Integer">
        SELECT COUNT(*)