Merge branch 'master-bg-update' into base-modify

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -302,6 +302,9 @@
                 </foreach>
                 )
             </if>
+            <if test="zoneId != null">
+                and o1.start_zone_id = #{zoneId}
+            </if>
             <if test="zoneIds != null and zoneIds.size > 0">
                 and (o1.start_zone_id in
                 <foreach collection="zoneIds" item="id" open="(" separator="," close=")">