Merge branch 'developer' into alpha

Helius

2022-03-15 5b94c18b2204a96be55798f1619a416526288e76

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java

@@ -43,9 +43,21 @@
    @ApiModelProperty(value = "服务单状态")
    private String status;

    @ApiModelProperty(value = "服务单评论")
    private String comment;


    @ApiModelProperty(value = "服务明细")
    private List<ServiceOrderDetailItemVo> items;

    public String getComment() {
        return comment;
    }

    public void setComment(String comment) {
        this.comment = comment;
    }

    public String getServiceNo() {
        return serviceNo;
    }