Merge remote-tracking branch 'origin/master'

nickchange

2023-10-25 80b4175382a9030ecb9722d8a080c12a41001871

 cloud-server-other/src/main/resources/mapper/GameMapper.xml

@@ -14,6 +14,9 @@
            <if test ="query.type==3">
                and st.id =#{query.id}
            </if>
            <if test ="query.type==2">
                and ga.operationId =#{query.id}
            </if>
            <if test="query.provinceCode!=null and query.provinceCode!=''">
                and ga.provinceCode = #{query.provinceCode}

@@ -68,6 +71,9 @@
            <if test="state!=null ">
                and  bk.status=#{state}
            </if>
            <if test="storeId!=null ">
                and  st.id=#{storeId}
            </if>

        
        </where>