Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/sh/rest/OrderProductSnapshotController.java

@@ -26,7 +26,7 @@
    private final OrderProductSnapshotService orderProductSnapshotService;

    @GetMapping
    @ApiOperation("查询订单商品快照")
    @ApiOperation("根据订单号查询订单商品快照")
    public ResponseEntity<Object> queryOrderProductSnapshot(@RequestParam String orderNum) {
        return new ResponseEntity<>(R.success(orderProductSnapshotService.queryOrderProductSnapshot(orderNum)), HttpStatus.OK);
    }