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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java

@@ -75,5 +75,9 @@

    @ApiModelProperty("订单完成结束时间")
    private String completeTimeEnd;
    private List<String> siteIds;

    @ApiModelProperty(value = "完工时间排序 1=升序 2=降序")
    private Integer completeType ;

}