Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a5294f6aec
@ -22,7 +22,7 @@ public class DataEntryEngineModelExcel extends MpaasBasePojo {
|
||||
/**
|
||||
* 产品型号(全称)
|
||||
*/
|
||||
@ExcelProperty("产品型号(全称)")
|
||||
@ExcelProperty("产品型号")
|
||||
private String modelName;
|
||||
|
||||
/**
|
||||
@ -32,9 +32,9 @@ public class DataEntryEngineModelExcel extends MpaasBasePojo {
|
||||
private String modelNameSimple;
|
||||
|
||||
/**
|
||||
* 产品编号
|
||||
* (状态代号)产品编号
|
||||
*/
|
||||
@ExcelProperty("产品编号")
|
||||
@ExcelProperty("状态代号/产品编号")
|
||||
private String productNumber;
|
||||
|
||||
/**
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user