Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/sh/service/OrderReturnService.java

@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.oying.modules.sh.domain.request.AuditOrderReturn;
import com.oying.modules.sh.domain.request.ReturnOrder;
import com.oying.utils.PageResult;

/**
@@ -36,7 +37,7 @@
    * 创建
    * @param resources /
    */
    void create(OrderReturn resources);
    void create(ReturnOrder resources);

    /**
    * 编辑