Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 af0f58e4b39a363b73587fa1b4cce7be46e203f5

 src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java

@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;