Merge remote-tracking branch 'origin/dev' into dev

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 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;

}