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

maven

15 小时以前 55c4143362c7df1ece4523597e26947d35e21bda

 src/main/java/com/ruoyi/device/pojo/DeviceLedger.java

@@ -12,7 +12,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * 设备台账实体类