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

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesOrderAction.java

@@ -53,7 +53,7 @@
    private ShopSalesmanOrderDao shopSalesmanOrderDao;


    @ApiOperation(value = "获取推广订单", notes = "keywords=1 推广订单，keywords=2 邀请订单")
    @ApiOperation(value = "获取推广订单", notes = "")
    @PostMapping(value = "/getOrderList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SalesOrderVo.class)