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

zss

9 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 src/main/java/com/ruoyi/technology/bean/vo/TechnologyBomVo.java

@@ -1,15 +1,15 @@
package com.ruoyi.technology.bean.vo;

import com.ruoyi.technology.pojo.TechnologyBom;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

@Data
public class TechnologyBomVo extends TechnologyBom {

    @ApiModelProperty("产品名称")
    @Schema(description = "产品名称")
    private String productName;

    @ApiModelProperty("规格型号")
    @Schema(description = "规格型号")
    private String productModelName;
}