Merge branch 'feature-business-minigram' into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -743,4 +743,15 @@
         ORDER BY
             chargeNum DESC;
     </select>
+
+    <select id="getStationIdsByMerchantIds" resultType="java.lang.String">
+        select
+            id
+        from
+            pile_station_info
+        where merchant_id in
+            <foreach collection="merchantIds" item="merchantId" open="(" separator="," close=")">
+                #{merchantId,jdbcType=VARCHAR}
+            </foreach>
+    </select>
 </mapper>