Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 8e1a9aa9e896f24f5244f042ecfb9e49effbe6bf

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

@@ -25,5 +25,7 @@
    @ApiModelProperty(value = "报工时长（秒）"  )
    private Integer duration;

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

}