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

gongchunyi

22 小时以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 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;
}