Merge remote-tracking branch 'origin/master'

This commit is contained in:
zjh 2025-12-17 18:28:10 +08:00
commit a5294f6aec

View File

@ -22,7 +22,7 @@ public class DataEntryEngineModelExcel extends MpaasBasePojo {
/** /**
* 产品型号全称 * 产品型号全称
*/ */
@ExcelProperty("产品型号(全称)") @ExcelProperty("产品型号")
private String modelName; private String modelName;
/** /**
@ -32,9 +32,9 @@ public class DataEntryEngineModelExcel extends MpaasBasePojo {
private String modelNameSimple; private String modelNameSimple;
/** /**
* 产品编号 * (状态代号)产品编号
*/ */
@ExcelProperty("产品编号") @ExcelProperty("状态代号/产品编号")
private String productNumber; private String productNumber;
/** /**