Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/PaymentTestController.java

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java

@@ -504,4 +504,11 @@ public interface OrderBasicInfoService{
      * @param orderCode
      */
     List<BusinessOrderBillingInfoVO> getOrderBillingDetail(String orderCode);
+
+    /**
+     * 临时接口，根据站点id、订单创建时间区间查询订单编号
+     * @param dto
+     * @return
+     */
+    List<String> tempGetOrderCodes(QueryOrderDTO dto);
 }