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

skyouc

6 天以前 3f2b778ab3fbee3d851ed7033451cc008366ab4b

 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;

}