Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/resources/mapper/CommonMapper.xml

@@ -86,7 +86,9 @@
                 </foreach>
             </if>
             and a.company_wechat_id = #{companyWechatId}
-        HAVING distance &lt; 50000
+        <if test="lng != '0'.toString() and lat != '0'.toString()">
+            HAVING distance &lt; 50000
+        </if>
         ORDER BY distance
     </select>