Merge remote-tracking branch 'gitlab/dev'

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/TbInventoryCompareResult.java

@@ -0,0 +1,45 @@
+package com.ruoyi.inventory.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.inventory.domain.dto.DepAssetLossDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class TbInventoryCompareResult extends BaseEntity {
+    /**
+     * 盘点时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "盘点日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    /**
+     * 盘点部门
+     */
+    @Excel(name = "盘点部门")
+    private String inventoryDepartment;
+
+    /**
+     * 盘点资产损失总金额
+     */
+    @Excel(name = "盘点资产损失总金额")
+    private Double lossTotal;
+
+    /**
+     * 资产盘点结果集
+     */
+    @Excel(name = "资产盘点结果集")
+    private List<TbInventoryCompare> assetResultList;
+
+}