Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-12-27 c899166d7986bbc5a8db58381e75f27ea2aeac1e

 ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml

@@ -23,10 +23,10 @@
            left JOIN ums_data_dictionary t2 ON t1.type = t2.id
        <where>
            <if test="keyword!=null and keyword!=''">
                t1.store_name LIKE  CONCAT('%', #{keyword}, '%')
                t1.store_number LIKE  CONCAT('%', #{keyword}, '%')
            </if>
            <if test="status!=null and status!='' and status!='0' ">
                t1.status = #{status}
             and   t1.status = #{status}
            </if>
        </where>
        order by t1.id desc