Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java

@@ -16,7 +16,7 @@
    private String id;
    @Excel(name = "设备编号", width = 15)
    private String equipmentId;
    @Excel(name = "设备名称", width = 15)
    @Excel(name = "设备名称", width = 20)
    private String equipmentName;
    @Excel(name = "零件号", width = 15)
    private String partsCode;