From 3df04e32e4190bfe8a74998f19fedbbfa9747f29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 05:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
index cb98621..ac8c3f2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwUnitVO.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.vo;
+import annotation.Excel;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwUnit;
@@ -18,24 +19,26 @@
@Accessors(chain = true)
public class YwUnitVO extends AbsVo {
- /** 鍗曚綅缂栫爜 */
+ @Excel(name = "鍗曚綅缂栫爜")
private String unitCode;
- /** 鍗曚綅鍚嶇О */
+ @Excel(name = "鍗曚綅鍚嶇О")
private String unitName;
- /** 鍗曚綅鑱旂郴浜� */
+ @Excel(name = "鍗曚綅鑱旂郴浜�")
private String unitContact;
- /** 鍗曚綅鑱旂郴浜虹數璇� */
+ @Excel(name = "鍗曚綅鑱旂郴浜虹數璇�")
private String unitContactPhone;
- /** 鍗曚綅绠$悊鍛樿处鍙� */
+ @Excel(name = "鍗曚綅绠$悊鍛樿处鍙�")
private String unitAdminAccount;
- /** 澶囨敞 */
+ @Excel(name = "澶囨敞")
private String remark;
+ private Integer workOrderCount;
+
public static YwUnitVO getVoByEntity(@NonNull YwUnit entity, YwUnitVO vo) {
if(vo == null) {
vo = new YwUnitVO();
--
Gitblit v1.8.0