From f58f45c6e078c706fa4c6f1f4decb9cb73b9f32b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 9 Apr 2024 11:22:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8E=BB=E6=8E=89=E9=85=8D=E5=90=88=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessEsAnnualInit.java           |   2 +-
 .../entity/ProcessEsAnnualReport.java         |   2 +-
 .../modules/activiti/util/ExcelUtils.java     |   2 +-
 ...度制修订计划（各部门主动上报）导入模板.xls | Bin 19968 -> 19968 bytes
 .../年度制修订计划（标准化发起）导入模板.xls  | Bin 20480 -> 20480 bytes
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
index 2186a7fd..03b28181 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
@@ -321,7 +321,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 配合单位
      */
-    @Excel(name = "*配合单位", width = 15, orderNum = "19")
+    @Excel(name = "配合单位", width = 15, orderNum = "19")
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
index c7fd0764..6835d0df 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
@@ -325,7 +325,7 @@ public class ProcessEsAnnualReport implements Serializable {
     /**
      * 配合单位
      */
-    @Excel(name = "*配合单位", width = 15, orderNum = "7")
+    @Excel(name = "配合单位", width = 15, orderNum = "7")
     @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
index 8ceea645..3c038e7c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
@@ -321,7 +321,7 @@ public class ExcelUtils {
     public String validCooperateUnit(String value, List<SysDictItemCore> listDict) {
         // 非空检查
         if (StrUtil.isBlank(value)) {
-            return "'配合单位'不能为空。";
+            return "";
         }
         // 检查配合单位
         if (!excelUtils.validDict("depart_name", value, "sys_depart", "id", false, listDict)) {
diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划（各部门主动上报）导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划（各部门主动上报）导入模板.xls
index 9dcdcdf8f1813ea7f0aae5fbb50caf40255aef05..67366f865b61fbc4283868a7833a451f3f3fd41f 100644
GIT binary patch
delta 120
zcmZpe!`Lu~aYGIZTfm&=6wR*5MJ#QMA2<JGS!>D|J$bp6E0BC^HJzJ<fzfv&M@VR}
zum9%R)?b(zi#JcO*J0sfXW(IAU|?im2SOg6$)}vn*noT>*!;^mjFpYyx<1g*&0(Hg
UEUYFBh79JD3w`@18?f*I01_x7HUIzs

delta 124
zcmZpe!`Lu~aYGIZ+X3xhH-YfUMJ#QMe>eYRS!>FeK6$y7E0BC^HC>#Qfs=_ri@|py
zM@VR}uRjBWBm*M@E5qh~>o3fV^_yGlby)a>7z7y@fWksRC@462pR?H}mjG6_hArkm
ZgExnHa<Q-)F_<zKOfK~8pKQRw0|4j6AtwL;

diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls
index a850a67714244634422a5aa0bfb351c5aa17828b..d6f3a427bea75f909fca9ab35ee30381146d0e31 100644
GIT binary patch
delta 119
zcmZozz}T>WaYGIZ+XJ2Txtd**i&)wimu~*aGTV%ifAUmoS4PFnx2=5{xmg$(eJ65+
zga-TiZ??B(VP;g{?Bc-6!pJ$<%SDZkfkB9Yfq@Z-fh?iTbuLYelMPsSHn~k?WnG~F
VG<WkfZ!Q*A69z*D^T``sq5(z*AQ=Dv

delta 127
zcmZozz}T>WaYGIZ+lA<Bhv$V(E@Ek8+_?EC%WN}7>B&>AT^V&Z-?sK;6lZ1NWMa@_
z@SVsJ5*qC5&%hwXz{tSLu-Vv_g_+TKvxNgI3nRm1I~O%RHU?$}2B0Jx5Hd4wE^=vN
e+~hWql~u+WX#VDD-drrKMhvD529r0sL<0aD&>)8Z