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

zhanghua

2023-03-18 71f3101370c3db0ec00178d51a723816c9bcddbd

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

@@ -26,7 +26,7 @@
                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