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

puzhibing

2023-07-18 87c7a162dc7621553022fbabb0486d58629a9c0c

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java

@@ -74,7 +74,7 @@
     * @return
     * @throws Exception
     */
    OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
    OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;


    /**
@@ -149,4 +149,6 @@
     * @throws Exception
     */
    List<OrderListWarpper> queryNotInvoiceOrder(Integer uid, NotInvoiceOrder notInvoiceOrder) throws Exception;


}