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

yaowanxin

6 天以前 dfacb4e315a49f2c0399574ef094c87b96e7e248

 performance-server/src/main/java/com/ruoyi/performance/dto/AuxiliaryOriginalHoursLookDto.java

@@ -23,4 +23,11 @@

    @ApiModelProperty("结束时间")
    private String endDate;


    @ApiModelProperty("辅助工时开始时间")
    private String assistBeginDate;

    @ApiModelProperty("辅助工时结束时间")
    private String assistEndDate;
}