Merge remote-tracking branch 'origin/master'

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java

@@ -62,6 +62,11 @@ public class ProdTechnologyInfo extends TenantEntity {
      */
     private String activeFlag;
 
+    /**
+     * 工艺名称
+     */
+    private String technologyName;
+
     /**
      * 备注
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java

@@ -65,6 +65,11 @@ public class ProdTechnologyInfoBo extends BaseEntity {
      */
     private String activeFlag;
 
+    /**
+     * 工艺名称
+     */
+    private String technologyName;
+
     /**
      * 备注
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java

@@ -42,6 +42,9 @@ public class ProdTechnologyInfoVo implements Serializable {
     @ExcelProperty(value = "工序名称")
     private String processName;
 
+    @ExcelProperty(value = "工艺名称")
+    private String technologyName;
+
     /**
      * 物料ID
      */