Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-28 e290789c592db88cfbffac7ecbdcd8f998e45796

 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;

}