Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-04 c7c49be8b15e6355dc19e8705dc7bc2de603e398

 server/src/main/java/doumeemes/dao/business/dto/CreateWorkorderRecordDTO.java

@@ -26,6 +26,6 @@
    private Integer duration;

    @ApiModelProperty(value = "报工类型 0计件 1计时"  )
    private Integer salaryType;
    private Integer type;

}