From 9946a9efd4ef1ee63d58b7ced36dde90cc92b321 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 19 Oct 2022 15:44:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/report/entity/LawsMonthlyReportWriteEO.java    | 2 +-
 .../java/com/jero/modules/report/enums/DictCodeReportEnum.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
index 2563e41b4..11892a582 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
@@ -116,7 +116,7 @@ public class LawsMonthlyReportWriteEO implements Serializable {
 	/**适用范围*/
 	@Excel(name = "适用范围", width = 15)
     @ApiModelProperty(value = "适用范围")
-    @Dict(dicCode ="apply_scope")
+    @Dict(dicCode ="fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2")
     private java.lang.String applyScope;
 
 	/**状态*/
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
index 7aea0d69d..5e6d09401 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java
@@ -8,7 +8,7 @@ package com.jero.modules.report.enums;
  */
 public enum DictCodeReportEnum {
     APPLYCAR("适用车型","car_type"),
-    APPLYSCOPE("适用范围","apply_scope"),
+    APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"),
     STATE("状态","state"),
     USEMETHOD("用法","yong4_fa3");
 

From c02cb4243e48eab778acd7c98e0c7309b75997cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 19 Oct 2022 18:02:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 78bc0e00e..947222a1c 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -21,7 +21,7 @@
         </span>
         <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
           <span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
-          <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
+          <span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
           <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
         </div>
 <!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->