Merge branch 'devlop' into devlop_whxrwms

skyouc

8 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java

@@ -18,7 +18,7 @@
    private String type;

    @ApiModelProperty("订单号")
    private List<String> orderNo;
    private String orderNo;

}