Merge branch 'dev'

jiangping

2023-10-26 1c84565d624ad0cce0576a22d0323cf3181d49cd

 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;

}