Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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;
 
 	/**状态*/

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");
 

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 }}-->