Merge remote-tracking branch 'origin/master'

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java

@@ -141,6 +141,9 @@ public class OperMaintenanceTaskEntity extends TenantEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long ticketId;
 
+	@ApiModelProperty(value = "票据名称")
+	private String ticketName;
+
 	@ApiModelProperty(value = "延期状态")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Integer delayStatus;

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/HygienePlanEntity.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.safeproduct.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +21,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ExcelIgnoreUnannotated
 @TableName("hzims_hygiene_plan")
 @ApiModel(value = "卫生自查计划实体类")
 public class HygienePlanEntity extends BaseEntity {

hzims-service/operational/src/main/resources/db/1.0.1.sql

@@ -7,3 +7,5 @@ alter table `hzims_oper_maintenance_task` add column `update_user_name` varchar(
 alter table `hzims_oper_maintenance_plan` add column `disposer_name` varchar(255) comment  '执行人姓名';
 alter table `hzims_oper_maintenance_plan` add column `create_user_name` varchar(255) comment  '创建人姓名';
 alter table `hzims_oper_maintenance_plan` add column `update_user_name` varchar(255) comment  '更新人姓名';
+-- 日常维护任务添加工作票名称
+alter table `hzims_oper_maintenance_task` add COLUMN `ticket_name` VARCHAR(255) comment '票据名称';