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

maven

23 小时以前 d9ff3817f056ad245a16bd394133a407d6c6b9cf

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;

@Data
public class ProductionProductMainDto extends ProductionProductMain {