Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-23 ba2a88b235360c8bea43f1c3adc90df84f437576

 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;

}