Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-09 eb336c03c93de5d0d73514db0ad66f5e02d2a422

 src/main/java/com/ruoyi/basic/dto/ProductModelDto.java

@@ -1,7 +1,7 @@
package com.ruoyi.basic.dto;

import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.bean.dto.ProductStructureDto;
import lombok.Data;

import java.util.List;