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

yaowanxin

2 天以前 17a7110753d9efeeaca28d7869fec4d084fc2d46

 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java

@@ -1,8 +1,6 @@
package com.ruoyi.device.execl;


import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;