合并主分支内容

2021-03-03 16:19:02 +08:00
parent 97deafb62d cc629ac18f
commit 4943af635f
28 changed files with 541 additions and 643 deletions
--- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java
@ -74,6 +74,8 @@ public interface SysOrderPauseMapper
     */
    int deletePauseByOrderId(Long[] orderIds);

+    long selectNearMainOrderIdByCusId(Long cusId);
+
    /**
     * 根据订单ID获取暂停计划
     * @param orderId