Merge remote-tracking branch 'origin/master'

xyc

2024-05-17 4a476243e0928236472f0a916467630cb5706ee5

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

@@ -4,10 +4,10 @@
<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao">

    <select id="getList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
        select a.*
        from product_model a
        select *
        from product_model
        <where>
            a.is_delete = 0
            is_delete = 0
            <if test="pid!=null">
                and pid =${pid}
            </if>
@@ -18,7 +18,8 @@
                and ${whereSql}
            </if>
        </where>
        ORDER BY sort
        ORDER BY
        product_type,sort
    </select>
    <select id="getNo" resultType="java.lang.Integer">
        SELECT COUNT(*)
@@ -31,6 +32,7 @@
            <if test="pid==null">
                and pid is null
            </if>
        and product_type =${productType}
        </where>
        Group by product_type
    </select>
@@ -45,6 +47,7 @@
               a.`NAME`                    as imgName,
               'node'                      as nodeType,
               ''                          as nodeTypeExt,
               s.svg_content               as svgContent,
               s.width                     as imgWidth,
               s.height                    as imgHeight,
               a.id                        as dataId,