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

gongchunyi

14 小时以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java

@@ -92,7 +92,8 @@
    @ApiModelProperty("总价")
    private String totalPrice;


    @ApiModelProperty("订单id(导出用)")
    private String ids;


}