Merge remote-tracking branch 'origin/master'

xuhy

2024-11-27 40b7f4a7f493cfa5d8b2531d99d7ef8f5a9d5f0a

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java

@@ -230,4 +230,13 @@
     * @throws Exception
     */
    Map<String, Object> queryMoneyInfo(Integer orderId, Integer orderType) throws Exception;

    /**
     * 设置订单轨迹id
     * @param orderId
     * @param orderType
     * @param trackId
     * @return
     */
    void getTrackId(Integer orderId, Integer orderType, Integer trackId);
}