Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-14 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c

 server/src/main/java/doumeemes/dao/business/model/Workorder.java

@@ -230,10 +230,12 @@
    @ExcelColumn(name="报工时长（秒）")
    private Integer duration;

    @ApiModelProperty(value = "工资单价（分)", example = "1")
    @ExcelColumn(name="工资单价（分)")
    @ApiModelProperty(value = "工资结果（元)", example = "1")
    @ExcelColumn(name="工资结果（元)")
    private Integer salary;

    @ApiModelProperty(value = "工资单价（元)", example = "1")
    @ExcelColumn(name="工资单价（元)")
    private Integer salaryPrice;
    @ApiModelProperty(value = "标准数量", example = "1")
    @ExcelColumn(name="标准数量")
    private Integer salaryNum;