Merge branch 'developer'

姜友瑶

2022-08-09 c423224dbe37ea69c1a36c696f85490343e68c4c

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -440,9 +440,6 @@
            <if test="shopId != null and shopId !='' ">
                SHOP_ID = #{shopId},
            </if>
            <if test="isDelete != null and isDelete !='' ">
                IS_DELETE = #{isDelete},
            </if>
            <if test="passWord != null and passWord !='' ">
                PASSWORD = #{passWord},
            </if>
@@ -578,13 +575,6 @@
            #{item}
        </foreach>
    </update>

    <!-- 根据id删除 -->
    <delete id="deleteById">
      DELETE FROM sys_vip_info
      where ID=#{id}
   </delete>



    <!-- 分页查询 -->
@@ -863,9 +853,6 @@
            <if test="record.shopId != null and record.shopId !='' ">
                and a.SHOP_ID = #{record.shopId}
            </if>
            <if test="record.isDelete != null and record.isDelete !='' ">
                and a.IS_DELETE = #{record.isDelete}
            </if>
            <if test="record.passWord != null and record.passWord !='' ">
                and a.PASSWORD = #{record.passWord}
            </if>
@@ -932,7 +919,7 @@


    <sql id="where1">
        where 1=1
        where    a.IS_DELETE = 'N'
        <if test="record!=null">
            <if test="record.id != null and record.id !='' ">
                and a.ID = #{record.id}
@@ -994,9 +981,6 @@
            </if>
            <if test="record.shopId != null and record.shopId !='' ">
                and a.SHOP_ID = #{record.shopId}
            </if>
            <if test="record.isDelete != null and record.isDelete !='' ">
                and a.IS_DELETE = #{record.isDelete}
            </if>
            <if test="record.passWord != null and record.passWord !='' ">
                and a.PASSWORD = #{record.passWord}