Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java

@@ -60,12 +60,12 @@ public class WindowEntity extends WindowVo {
     /**
      * 红旗窗口 (1.是，0.否)
      */
-    //@Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
+    @Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer hongqi;
     /**
      * 无人值守(1.是)
      */
-    //@Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
+    @Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer duty;
     /**
      * 显示内容
@@ -84,12 +84,12 @@ public class WindowEntity extends WindowVo {
     /**
      * 楼栋
      */
-    @Excel(name = "楼栋")
+    @Excel(name = "楼栋",cellType= Excel.ColumnType.NUMERIC)
     private Integer building;
     /**
      * 楼层
      */
-    @Excel(name = "楼层")
+    @Excel(name = "楼层",cellType= Excel.ColumnType.NUMERIC)
     private Integer level;
     /**
      * 名称描述

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -59,6 +59,15 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         super.setModuleDesc("站点部门窗口");
     }
 
+    /**
+     *
+     */
+    @Override
+    @UnAuth
+    public void downloadTemplate() {
+        super.downloadTemplate();
+    }
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "hongqi", paramService.getParamBySecondOrganize("Window", "hongqi"));

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -84,6 +84,16 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         super.init(model, context);
     }
 
+
+    /**
+     *
+     */
+    @Override
+    @UnAuth
+    public void downloadTemplate() {
+        super.downloadTemplate();
+    }
+
     /**
      * 工作人员登录
      */