From 141271f8c1134259179bd53430a6fec509560878 Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Mon, 8 Aug 2022 10:00:50 +0800
Subject: [PATCH] 1

---
 .../xzszwhy/config/TopMenuBaseController.java |   6 +-
 .../ActivityLibraryController.java            |  79 +++---
 .../activitylibrary-mapper.xml                |  24 +-
 .../activityhistory/view-activityhistory.html |  12 +-
 .../activitylibrary/save-activitylibrary.html |  14 +-
 .../update-activitylibrary.html               |  16 +-
 .../save-activityintroduced.html              |   8 +-
 .../update-activityintroduced.html            |   8 +-
 .../activityv2/jointype/save-jointype.html    |   4 +-
 .../activityv2/jointype/update-jointype.html  |   4 +-
 .../save-intangiblelibrary.html               |   8 +-
 .../update-intangiblelibrary.html             |   8 +-
 .../save-intangiblelibraryperson.html         |   4 +-
 .../update-intangiblelibraryperson.html       |   4 +-
 .../save-showdeviceresources.html             |   4 +-
 .../update-showdeviceresources.html           |   4 +-
 .../activityinfo/save-activityinfo.html       |   4 +-
 .../matchinfo/save-matchinfo.html             |   4 +-
 .../venuesinfo/save-venuesinfo.html           |   8 +-
 .../venuesinfo/update-venuesinfo.html         |   8 +-
 .../venuesproject/save-venuesproject.html     |   8 +-
 .../venuesproject/update-venuesproject.html   |   8 +-
 .../venuesprojectv2/update-venuesproject.html |   8 +-
 .../route/venuebooking/venuev2/save.html      |   8 +-
 .../route/venuebooking/venuev2/update.html    |   8 +-
 .../agreecontent/update-agreecontent.html     |   2 +-
 .../route/volunteer/team/save-team.html       |   6 +-
 .../route/volunteer/team/update-team.html     |   6 +-
 .../volunteer/volunteer/save-volunteer.html   |  18 +-
 .../volunteer/volunteer/update-volunteer.html |  18 +-
 .../volunteer/volunteer/view-volunteer.html   |  36 +--
 .../templates/library/index/index.html        | 135 +++++++++++
 .../articlecategory/save-articlecategory.html |   4 +-
 .../update-articlecategory.html               |   4 +-
 .../resources/templates/show/index/index.html | 228 ++++++++++++++++++
 .../templates/volunteer/index/index.html      | 131 ++++++++++
 36 files changed, 683 insertions(+), 176 deletions(-)
 create mode 100644 src/main/resources/templates/library/index/index.html
 create mode 100644 src/main/resources/templates/show/index/index.html
 create mode 100644 src/main/resources/templates/volunteer/index/index.html

diff --git a/src/main/java/cn/com/tenlion/xzszwhy/config/TopMenuBaseController.java b/src/main/java/cn/com/tenlion/xzszwhy/config/TopMenuBaseController.java
index 1a2dc71..550cfd5 100644
--- a/src/main/java/cn/com/tenlion/xzszwhy/config/TopMenuBaseController.java
+++ b/src/main/java/cn/com/tenlion/xzszwhy/config/TopMenuBaseController.java
@@ -32,7 +32,7 @@ public class TopMenuBaseController {
     @ApiOperation(value = "志愿者系统", notes = "志愿者系统")
     @GetMapping("volunteer")
     public ModelAndView volunteerMenu(){
-        return new ModelAndView("index/configmenu");
+        return new ModelAndView("volunteer/index/index");
     }
 
 
@@ -46,7 +46,7 @@ public class TopMenuBaseController {
     @ApiOperation(value = "展览系统", notes = "展览系统")
     @GetMapping("show")
     public ModelAndView showMenu(){
-        return new ModelAndView("index/configmenu");
+        return new ModelAndView("show/index/index");
     }
 
 
@@ -60,7 +60,7 @@ public class TopMenuBaseController {
     @ApiOperation(value = "非遗数据库", notes = "非遗数据库")
     @GetMapping("library")
     public ModelAndView libraryMenu(){
-        return new ModelAndView("index/configmenu");
+        return new ModelAndView("library/index/index");
     }
 
 
diff --git a/src/main/java/cn/com/tenlion/xzszwhy/culturalactivity/activityv1/controller/apis/activitylibrary/ActivityLibraryController.java b/src/main/java/cn/com/tenlion/xzszwhy/culturalactivity/activityv1/controller/apis/activitylibrary/ActivityLibraryController.java
index 17ce7bd..70e77e0 100644
--- a/src/main/java/cn/com/tenlion/xzszwhy/culturalactivity/activityv1/controller/apis/activitylibrary/ActivityLibraryController.java
+++ b/src/main/java/cn/com/tenlion/xzszwhy/culturalactivity/activityv1/controller/apis/activitylibrary/ActivityLibraryController.java
@@ -1,15 +1,16 @@
 package cn.com.tenlion.xzszwhy.culturalactivity.activityv1.controller.apis.activitylibrary;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.pojo.dtos.activitylibrary.TeamDTO;
-import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.pojo.dtos.activitylibrary.VolunteerDTO;
+import cn.com.tenlion.xzszwhy.venuebooking.pojo.dtos.venuesinfo.VenuesInfoDTO;
+import cn.com.tenlion.xzszwhy.venuebooking.service.venuesinfo.IVenuesInfoService;
 import cn.com.tenlion.xzszwhy.culturalactivity.config.properties.VolunteerProperties;
 import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.pojo.dtos.activitylibrary.ActivityLibraryDTO;
-import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.pojo.dtos.activitylibrary.VenuesInfoDTO;
 import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.pojo.vos.activitylibrary.ActivityLibraryVO;
 import cn.com.tenlion.xzszwhy.culturalactivity.activityv1.service.activitylibrary.IActivityLibraryService;
+import cn.com.tenlion.xzszwhy.volunteer.pojo.dtos.team.TeamDTO;
+import cn.com.tenlion.xzszwhy.volunteer.pojo.dtos.volunteer.VolunteerDTO;
+import cn.com.tenlion.xzszwhy.volunteer.service.team.ITeamService;
+import cn.com.tenlion.xzszwhy.volunteer.service.volunteer.IVolunteerService;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import ink.wgink.annotation.CheckRequestBodyAnnotation;
 import ink.wgink.common.base.DefaultBaseController;
@@ -18,7 +19,7 @@ import ink.wgink.exceptions.RemoveException;
 import ink.wgink.exceptions.SearchException;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.pojo.ListPage;
-import ink.wgink.pojo.dtos.CurrentUserIdInfoDTO;
+import ink.wgink.pojo.bos.UserInfoBO;
 import ink.wgink.pojo.result.ErrorResult;
 import ink.wgink.pojo.result.SuccessResult;
 import ink.wgink.pojo.result.SuccessResultData;
@@ -27,7 +28,6 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
-import org.thymeleaf.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,6 +51,12 @@ public class ActivityLibraryController extends DefaultBaseController {
     private SecurityComponent securityComponent;
     @Autowired
     private VolunteerProperties volunteerProperties;
+    @Autowired
+    private IVenuesInfoService venuesInfoService;
+    @Autowired
+    private ITeamService teamService;
+    @Autowired
+    private IVolunteerService volunteerService;
 
     @ApiOperation(value = "历史活动", notes = "历史活动分页列表接口")
     @ApiImplicitParams({
@@ -141,29 +147,36 @@ public class ActivityLibraryController extends DefaultBaseController {
     }
 
 
+    @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("getcurrentuseridinfo")
+    public UserInfoBO getCurrentUserIdInfo() {
+        return securityComponent.getCurrentUser();
+    }
 
-/*    @ApiOperation(value = "场馆选择", notes = "场馆选择分页列表接口")
+
+    @ApiOperation(value = "场馆选择", notes = "场馆选择分页列表接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("listpagevenues")
     public SuccessResultList<List<VenuesInfoDTO>> listpagevenues(ListPage page) throws SearchException {
         Map<String, Object> params = requestParams();
-        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
-        RestTemplate restTemplate = new RestTemplate();
-        String url = volunteerProperties.getVenuesUrl();
-        url = url + "?access_token=" + token.getAccessToken();
-        url = url + "&page=" + page.getPage() + "&rows=" + page.getRows();
-        System.out.println(url);
-        String str = restTemplate.getForObject(url, String.class, params);
-        JSONObject jsonObject = new JSONObject();
-        String dtoStr = null;
-        List<VenuesInfoDTO> venuesInfoDTOList = new ArrayList<>();
-        if(!StringUtils.isEmpty(str)) {
-            jsonObject = JSONObject.parseObject(str);
-            dtoStr = jsonObject.getString("rows");
-            PageHelper.startPage(page.getPage(), page.getRows());
-            venuesInfoDTOList = JSONObject.parseArray(dtoStr, VenuesInfoDTO.class);
-        }
-        return new SuccessResultList<>(venuesInfoDTOList, jsonObject.getInteger("page"), jsonObject.getLong("total"));
+//        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
+//        RestTemplate restTemplate = new RestTemplate();
+//        String url = volunteerProperties.getVenuesUrl();
+//        url = url + "?access_token=" + token.getAccessToken();
+//        url = url + "&page=" + page.getPage() + "&rows=" + page.getRows();
+//        System.out.println(url);
+//        String str = restTemplate.getForObject(url, String.class, params);
+//        JSONObject jsonObject = new JSONObject();
+//        String dtoStr = null;
+//        List<VenuesInfoDTO> venuesInfoDTOList = new ArrayList<>();
+//        if(!StringUtils.isEmpty(str)) {
+//            jsonObject = JSONObject.parseObject(str);
+//            dtoStr = jsonObject.getString("rows");
+//            PageHelper.startPage(page.getPage(), page.getRows());
+//            venuesInfoDTOList = JSONObject.parseArray(dtoStr, VenuesInfoDTO.class);
+//        }
+        return venuesInfoService.listPageVenuesInfoResources(page);
     }
 
     @ApiOperation(value = "志愿者团队", notes = "志愿者团队分页列表接口")
@@ -171,7 +184,7 @@ public class ActivityLibraryController extends DefaultBaseController {
     @GetMapping("listpageteam")
     public SuccessResultList<List<TeamDTO>> listpageteam(ListPage page) throws SearchException {
         Map<String, Object> params = requestParams();
-        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
+/*        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
         RestTemplate restTemplate = new RestTemplate();
         String url = volunteerProperties.getTeamUrl();
         url = url + "?access_token=" + token.getAccessToken();
@@ -186,8 +199,8 @@ public class ActivityLibraryController extends DefaultBaseController {
             dtoStr = jsonObject.getString("rows");
             PageHelper.startPage(page.getPage(), page.getRows());
             teamDTOList = JSONObject.parseArray(dtoStr, TeamDTO.class);
-        }
-        return new SuccessResultList<>(teamDTOList, jsonObject.getInteger("page"), jsonObject.getLong("total"));
+        }*/
+        return teamService.listPageTeam(page);
     }
 
     @ApiOperation(value = "志愿者", notes = "志愿者分页列表接口")
@@ -195,7 +208,7 @@ public class ActivityLibraryController extends DefaultBaseController {
     @GetMapping("listpagevolunteer")
     public SuccessResultList<List<VolunteerDTO>> listpagevolunteer(ListPage page) throws SearchException {
         Map<String, Object> params = requestParams();
-        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
+/*        ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
         RestTemplate restTemplate = new RestTemplate();
         String url = volunteerProperties.getVolunteerUrl();
         url = url + "?access_token=" + token.getAccessToken();
@@ -209,8 +222,8 @@ public class ActivityLibraryController extends DefaultBaseController {
             dtoStr = jsonObject.getString("rows");
             PageHelper.startPage(page.getPage(), page.getRows());
             volunteerDTOList = JSONObject.parseArray(dtoStr, VolunteerDTO.class);
-        }
-        return new SuccessResultList<>(volunteerDTOList, jsonObject.getInteger("page"), jsonObject.getLong("total"));
-    }*/
+        }*/
+        return volunteerService.listPageVolunteer(page);
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/culturalactivity/activityv1/activitylibrary/activitylibrary-mapper.xml b/src/main/resources/mybatis/mapper/culturalactivity/activityv1/activitylibrary/activitylibrary-mapper.xml
index cf158e3..033705a 100644
--- a/src/main/resources/mybatis/mapper/culturalactivity/activityv1/activitylibrary/activitylibrary-mapper.xml
+++ b/src/main/resources/mybatis/mapper/culturalactivity/activityv1/activitylibrary/activitylibrary-mapper.xml
@@ -53,9 +53,9 @@
         SELECT
         t1.activity_title,
         t1.activity_type,
-        dt1.dictionary_name activity_type_dictionary_name,
+        dt1.data_name activity_type_dictionary_name,
         t1.activity_object_oriented,
-        GROUP_CONCAT(DISTINCT dt2.dictionary_name) activity_object_oriented_dictionary_name,
+        GROUP_CONCAT(DISTINCT dt2.data_name) activity_object_oriented_dictionary_name,
         LEFT(t1.activity_start_time, 10) activity_start_time,
         LEFT(t1.activity_end_time, 10) activity_end_time,
         t1.activity_start_time start_time,
@@ -83,15 +83,15 @@
         FROM
         gen_activity_library t1
         LEFT JOIN
-        data_dictionary dt1
+        data_data dt1
         ON
-        dt1.dictionary_id = t1.activity_type
+        dt1.data_id = t1.activity_type
         AND
         dt1.is_delete = 0
         LEFT JOIN
-        data_dictionary dt2
+        data_data dt2
         ON
-        FIND_IN_SET(dt2.dictionary_id,t1.activity_object_oriented)
+        FIND_IN_SET(dt2.data_id,t1.activity_object_oriented)
         AND
         dt2.is_delete = 0
         WHERE
@@ -492,9 +492,9 @@
         SELECT
             t1.activity_title,
             t1.activity_type,
-            dt1.dictionary_name activity_type_dictionary_name,
+            dt1.data_name activity_type_dictionary_name,
             t1.activity_object_oriented,
-            GROUP_CONCAT(DISTINCT dt2.dictionary_name) activity_object_oriented_dictionary_name,
+            GROUP_CONCAT(DISTINCT dt2.data_name) activity_object_oriented_dictionary_name,
             t1.activity_start_time,
             t1.activity_end_time,
             t1.activity_address,
@@ -520,15 +520,15 @@
         FROM
             gen_activity_library t1
         LEFT JOIN
-            data_dictionary dt1
+            data_data dt1
         ON
-            dt1.dictionary_id = t1.activity_type
+            dt1.data_id = t1.activity_type
         AND
             dt1.is_delete = 0
         LEFT JOIN
-            data_dictionary dt2
+            data_data dt2
         ON
-            FIND_IN_SET(dt2.dictionary_id,t1.activity_object_oriented)
+            FIND_IN_SET(dt2.data_id,t1.activity_object_oriented)
         AND
             dt2.is_delete = 0
         WHERE
diff --git a/src/main/resources/static/route/culturalactivity/activityV1/activityhistory/view-activityhistory.html b/src/main/resources/static/route/culturalactivity/activityV1/activityhistory/view-activityhistory.html
index f54e919..0d22348 100644
--- a/src/main/resources/static/route/culturalactivity/activityV1/activityhistory/view-activityhistory.html
+++ b/src/main/resources/static/route/culturalactivity/activityV1/activityhistory/view-activityhistory.html
@@ -33,7 +33,7 @@
                     <div class="layui-input-block layui-form" id="activityTypeRadioTemplateBox" lay-filter="activityTypeRadioTemplateBox"></div>
                     <script id="activityTypeRadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="activityType" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="activityType" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -42,7 +42,7 @@
                     <div class="layui-input-block layui-form" id="activityObjectOrientedCheckboxTemplateBox" lay-filter="activityObjectOrientedCheckboxTemplateBox"></div>
                     <script id="activityObjectOrientedCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="activityObjectOriented[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="activityObjectOriented[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -315,7 +315,7 @@
 
         // 初始化活动类型单选
         function initActivityTypeSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityTypeRadioTemplateBox').innerHTML = html;
                 });
@@ -334,7 +334,7 @@
 
         // 初始化面向对象复选
         function initActivityObjectOrientedCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityObjectOrientedCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityObjectOrientedCheckboxTemplateBox').innerHTML = html;
                 });
@@ -397,7 +397,7 @@
 
         // 初始化活动场馆下拉选择
         function initActivityVenuesSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityVenuesSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityVenuesSelectTemplateBox').innerHTML = html;
                 });
@@ -433,7 +433,7 @@
 
         // 初始化活动参与形式单选
         function initActivityFormTypeRadio(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityFormTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityFormTypeRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/save-activitylibrary.html b/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/save-activitylibrary.html
index 512fb0a..ed03157 100644
--- a/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/save-activitylibrary.html
+++ b/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/save-activitylibrary.html
@@ -33,7 +33,7 @@
                     <div class="layui-input-block layui-form" id="activityTypeRadioTemplateBox" lay-filter="activityTypeRadioTemplateBox"></div>
                     <script id="activityTypeRadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="activityType" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="activityType" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -42,7 +42,7 @@
                     <div class="layui-input-block layui-form" id="activityObjectOrientedCheckboxTemplateBox" lay-filter="activityObjectOrientedCheckboxTemplateBox"></div>
                     <script id="activityObjectOrientedCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="activityObjectOriented[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="activityObjectOriented[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -311,7 +311,7 @@
 
         // 初始化服务区域-市下拉选择
         function initTeamCitySelect() {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCitySelectTemplateBox').innerHTML = html;
                 });
@@ -323,7 +323,7 @@
 
         // 初始化所属区域下拉选择
         function initTeamAreaSelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -335,7 +335,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initTeamCountySelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCountySelectTemplateBox').innerHTML = html;
                 });
@@ -420,7 +420,7 @@
 
         // 初始化活动类型单选
         function initActivityTypeSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityTypeRadioTemplateBox').innerHTML = html;
                 });
@@ -432,7 +432,7 @@
 
         // 初始化面向对象复选
         function initActivityObjectOrientedCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityObjectOrientedCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityObjectOrientedCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/update-activitylibrary.html b/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/update-activitylibrary.html
index 8c7e8a8..4fc6be2 100644
--- a/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/update-activitylibrary.html
+++ b/src/main/resources/static/route/culturalactivity/activityV1/activitylibrary/update-activitylibrary.html
@@ -33,7 +33,7 @@
                     <div class="layui-input-block layui-form" id="activityTypeRadioTemplateBox" lay-filter="activityTypeRadioTemplateBox"></div>
                     <script id="activityTypeRadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="activityType" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="activityType" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -42,7 +42,7 @@
                     <div class="layui-input-block layui-form" id="activityObjectOrientedCheckboxTemplateBox" lay-filter="activityObjectOrientedCheckboxTemplateBox"></div>
                     <script id="activityObjectOrientedCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="activityObjectOriented[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="activityObjectOriented[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -362,7 +362,7 @@
 
         // 初始化活动类型单选
         function initActivityTypeSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityTypeRadioTemplateBox').innerHTML = html;
                 });
@@ -381,7 +381,7 @@
 
         // 初始化面向对象复选
         function initActivityObjectOrientedCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityObjectOrientedCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityObjectOrientedCheckboxTemplateBox').innerHTML = html;
                 });
@@ -464,7 +464,7 @@
 
         // 初始化所属区域下拉选择
         function initTeamAreaSelect(selectValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -480,7 +480,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initTeamCountySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCountySelectTemplateBox').innerHTML = html;
                 });
@@ -499,7 +499,7 @@
 
         // 初始化服务区域-市下拉选择
         function initTeamCitySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCitySelectTemplateBox').innerHTML = html;
                 });
@@ -591,7 +591,7 @@
 
         // 初始化活动参与形式单选
         function initActivityFormTypeRadio(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityFormTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityFormTypeRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/save-activityintroduced.html b/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/save-activityintroduced.html
index 30c4b5f..31487b9 100644
--- a/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/save-activityintroduced.html
+++ b/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/save-activityintroduced.html
@@ -100,7 +100,7 @@
                     <div class="layui-input-block layui-form" id="activityTypeCheckboxTemplateBox" lay-filter="activityTypeCheckboxTemplateBox"></div>
                     <script id="activityTypeCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="activityType[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="activityType[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -109,7 +109,7 @@
                     <div class="layui-input-block layui-form" id="objectCheckboxTemplateBox" lay-filter="objectCheckboxTemplateBox"></div>
                     <script id="objectCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="object[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="object[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -480,7 +480,7 @@
 
         // 初始化活动类型复选
         function initActivityTypeCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityTypeCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityTypeCheckboxTemplateBox').innerHTML = html;
                 });
@@ -567,7 +567,7 @@
 
         // 初始化面向人群复选
         function initObjectCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('objectCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('objectCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/update-activityintroduced.html b/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/update-activityintroduced.html
index 7b38550..6d8467b 100644
--- a/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/update-activityintroduced.html
+++ b/src/main/resources/static/route/culturalactivity/activityv2/activityintroduced/update-activityintroduced.html
@@ -100,7 +100,7 @@
                     <div class="layui-input-block layui-form" id="activityTypeCheckboxTemplateBox" lay-filter="activityTypeCheckboxTemplateBox"></div>
                     <script id="activityTypeCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="activityType[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="activityType[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -109,7 +109,7 @@
                     <div class="layui-input-block layui-form" id="objectCheckboxTemplateBox" lay-filter="objectCheckboxTemplateBox"></div>
                     <script id="objectCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="object[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="object[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -521,7 +521,7 @@
 
         // 初始化活动类型复选
         function initActivityTypeCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e36ad682-c6b4-44fe-a05c-889a5ff7c284', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('activityTypeCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('activityTypeCheckboxTemplateBox').innerHTML = html;
                 });
@@ -616,7 +616,7 @@
 
         // 初始化面向人群复选
         function initObjectCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9e6d4c5d-3377-4445-aa05-3d29673924b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('objectCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('objectCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityv2/jointype/save-jointype.html b/src/main/resources/static/route/culturalactivity/activityv2/jointype/save-jointype.html
index 94c9244..0dcd193 100644
--- a/src/main/resources/static/route/culturalactivity/activityv2/jointype/save-jointype.html
+++ b/src/main/resources/static/route/culturalactivity/activityv2/jointype/save-jointype.html
@@ -100,7 +100,7 @@
                             '<select id="msgType" name="msgType" lay-verify="required">'+
                                 '<option value="">请选择信息类型</option>'+
                                 '{{# for(var i = 0, item; item = d[i++];) { }}'+
-                                '<option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>'+
+                                '<option value="{{item.dataId}}">{{item.dataName}}</option>'+
                                 '{{# } }}'+
                             '</select>'+
                         '</scr'+'ipt>'+
@@ -129,7 +129,7 @@
 
             var template = 'msgTypeSelectTemplate'+index;
             var templateBox = 'msgTypeSelectTemplateBox'+index;
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/06f4110a-ae25-4df4-b559-1858db1e3804', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/06f4110a-ae25-4df4-b559-1858db1e3804', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById(template).innerHTML).render(data, function(html) {
                     document.getElementById(templateBox).innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/culturalactivity/activityv2/jointype/update-jointype.html b/src/main/resources/static/route/culturalactivity/activityv2/jointype/update-jointype.html
index 39439d7..f610aa0 100644
--- a/src/main/resources/static/route/culturalactivity/activityv2/jointype/update-jointype.html
+++ b/src/main/resources/static/route/culturalactivity/activityv2/jointype/update-jointype.html
@@ -108,7 +108,7 @@
                             '<select id="msgType" name="msgType'+i+'" lay-verify="required">'+
                                 '<option value="">请选择信息类型</option>'+
                                 '{{# for(var i = 0, item; item = d[i++];) { }}'+
-                                '<option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>'+
+                                '<option value="{{item.dataId}}">{{item.dataName}}</option>'+
                                 '{{# } }}'+
                             '</select>'+
                         '</scr'+'ipt>'+
@@ -128,7 +128,7 @@
         function initMsgTypeSelect(index, selectValue) {
             var template = 'msgTypeSelectTemplate'+index;
             var templateBox = 'msgTypeSelectTemplateBox'+index;
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/06f4110a-ae25-4df4-b559-1858db1e3804', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/06f4110a-ae25-4df4-b559-1858db1e3804', []), {}, null, function(code, data, args) {
                 debugger
                 laytpl(document.getElementById(template).innerHTML).render(data, function(html) {
                     document.getElementById(templateBox).innerHTML = html;
diff --git a/src/main/resources/static/route/library/intangiblelibrary/save-intangiblelibrary.html b/src/main/resources/static/route/library/intangiblelibrary/save-intangiblelibrary.html
index a6ad768..789f07c 100644
--- a/src/main/resources/static/route/library/intangiblelibrary/save-intangiblelibrary.html
+++ b/src/main/resources/static/route/library/intangiblelibrary/save-intangiblelibrary.html
@@ -73,7 +73,7 @@
                             <select id="libraryType" name="libraryType">
                                 <option value="">请选择项目类型</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -94,7 +94,7 @@
                             <select id="libraryOpenDate" name="libraryOpenDate">
                                 <option value="">请选择公布时间</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -210,7 +210,7 @@
 
         // 初始化项目类型
         function libraryTypeRadio() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/ba69da21-bd9c-4591-8149-c466ff31e85e', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/ba69da21-bd9c-4591-8149-c466ff31e85e', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryTypeRadioTemplateBox').innerHTML = html;
                 });
@@ -222,7 +222,7 @@
 
         // 初始化公布时间
         function libraryOpenDateRadio() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/3cd1c49b-007c-4a69-96a3-0eaa07cb86fa', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/3cd1c49b-007c-4a69-96a3-0eaa07cb86fa', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryOpenDateRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryOpenDateRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/library/intangiblelibrary/update-intangiblelibrary.html b/src/main/resources/static/route/library/intangiblelibrary/update-intangiblelibrary.html
index ef08529..cc4907c 100644
--- a/src/main/resources/static/route/library/intangiblelibrary/update-intangiblelibrary.html
+++ b/src/main/resources/static/route/library/intangiblelibrary/update-intangiblelibrary.html
@@ -73,7 +73,7 @@
                             <select id="libraryType" name="libraryType">
                                 <option value="">请选择项目类型</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -94,7 +94,7 @@
                             <select id="libraryOpenDate" name="libraryOpenDate">
                                 <option value="">请选择公布时间</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -326,7 +326,7 @@
 
         // 初始化项目类型
         function libraryTypeRadio(joinValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/ba69da21-bd9c-4591-8149-c466ff31e85e', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/ba69da21-bd9c-4591-8149-c466ff31e85e', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryTypeRadioTemplateBox').innerHTML = html;
                 });
@@ -343,7 +343,7 @@
 
         // 初始化公布时间
         function libraryOpenDateRadio(joinValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/3cd1c49b-007c-4a69-96a3-0eaa07cb86fa', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/3cd1c49b-007c-4a69-96a3-0eaa07cb86fa', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryOpenDateRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryOpenDateRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/library/intangiblelibraryperson/save-intangiblelibraryperson.html b/src/main/resources/static/route/library/intangiblelibraryperson/save-intangiblelibraryperson.html
index a5b3287..5a485f2 100644
--- a/src/main/resources/static/route/library/intangiblelibraryperson/save-intangiblelibraryperson.html
+++ b/src/main/resources/static/route/library/intangiblelibraryperson/save-intangiblelibraryperson.html
@@ -54,7 +54,7 @@
                         <select id="libraryPersonNation" name="libraryPersonNation">
                             <option value="">请选择传承人民族</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -181,7 +181,7 @@
 
         // 初始化传承人民族下拉选择
         function initLibraryPersonNationSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/61f86a5a-22b2-4d14-8cdb-46d3cd2bd864', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/61f86a5a-22b2-4d14-8cdb-46d3cd2bd864', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryPersonNationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryPersonNationSelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/library/intangiblelibraryperson/update-intangiblelibraryperson.html b/src/main/resources/static/route/library/intangiblelibraryperson/update-intangiblelibraryperson.html
index 45c4d82..8ea3cec 100644
--- a/src/main/resources/static/route/library/intangiblelibraryperson/update-intangiblelibraryperson.html
+++ b/src/main/resources/static/route/library/intangiblelibraryperson/update-intangiblelibraryperson.html
@@ -54,7 +54,7 @@
                         <select id="libraryPersonNation" name="libraryPersonNation">
                             <option value="">请选择传承人民族</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -199,7 +199,7 @@
 
         // 初始化传承人民族下拉选择
         function initLibraryPersonNationSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/61f86a5a-22b2-4d14-8cdb-46d3cd2bd864', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/61f86a5a-22b2-4d14-8cdb-46d3cd2bd864', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('libraryPersonNationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('libraryPersonNationSelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/show/showdeviceresources/save-showdeviceresources.html b/src/main/resources/static/route/show/showdeviceresources/save-showdeviceresources.html
index 79f631f..f12a436 100644
--- a/src/main/resources/static/route/show/showdeviceresources/save-showdeviceresources.html
+++ b/src/main/resources/static/route/show/showdeviceresources/save-showdeviceresources.html
@@ -51,7 +51,7 @@
                     <div class="layui-input-block layui-form" id="deviceResourcesPublishRadioTemplateBox" lay-filter="deviceResourcesPublishRadioTemplateBox"></div>
                     <script id="deviceResourcesPublishRadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="deviceResourcesPublish" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="deviceResourcesPublish" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -141,7 +141,7 @@
 
         // 初始化发布状态单选
         function initDeviceResourcesPublishRadio() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('deviceResourcesPublishRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('deviceResourcesPublishRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/show/showdeviceresources/update-showdeviceresources.html b/src/main/resources/static/route/show/showdeviceresources/update-showdeviceresources.html
index 7e15190..e440251 100644
--- a/src/main/resources/static/route/show/showdeviceresources/update-showdeviceresources.html
+++ b/src/main/resources/static/route/show/showdeviceresources/update-showdeviceresources.html
@@ -51,7 +51,7 @@
                     <div class="layui-input-block" id="deviceResourcesPublishRadioTemplateBox" lay-filter="deviceResourcesPublishRadioTemplateBox"></div>
                     <script id="deviceResourcesPublishRadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="deviceResourcesPublish" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="deviceResourcesPublish" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -143,7 +143,7 @@
 
         // 初始化发布状态单选
         function initDeviceResourcesPublishRadio(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('deviceResourcesPublishRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('deviceResourcesPublishRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/activityinfo/save-activityinfo.html b/src/main/resources/static/route/venuebooking/activityinfo/save-activityinfo.html
index 9f422e2..753afca 100644
--- a/src/main/resources/static/route/venuebooking/activityinfo/save-activityinfo.html
+++ b/src/main/resources/static/route/venuebooking/activityinfo/save-activityinfo.html
@@ -60,7 +60,7 @@
                         <select id="projectCategory" name="projectCategory">
                             <option value="">请选择主题</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -121,7 +121,7 @@
 
         //初始化活动主题
         function initProjectSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('projectSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('projectSelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/matchinfo/save-matchinfo.html b/src/main/resources/static/route/venuebooking/matchinfo/save-matchinfo.html
index 3131850..c56e5aa 100644
--- a/src/main/resources/static/route/venuebooking/matchinfo/save-matchinfo.html
+++ b/src/main/resources/static/route/venuebooking/matchinfo/save-matchinfo.html
@@ -59,7 +59,7 @@
                         <select id="projectCategory" name="projectCategory">
                             <option value="">请选择主题</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -122,7 +122,7 @@
 
         //初始化赛事主题
         function initProjectSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('projectSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('projectSelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuesinfo/save-venuesinfo.html b/src/main/resources/static/route/venuebooking/venuesinfo/save-venuesinfo.html
index fc04693..3972ccc 100644
--- a/src/main/resources/static/route/venuebooking/venuesinfo/save-venuesinfo.html
+++ b/src/main/resources/static/route/venuebooking/venuesinfo/save-venuesinfo.html
@@ -73,7 +73,7 @@
                                 <select id="venueType" name="venueType" lay-verify="required">
                                     <option value="">请选择</option>
                                     {{# for(var i = 0, item; item = d[i++];) { }}
-                                    <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                    <option value="{{item.dataId}}">{{item.dataName}}</option>
                                     {{# } }}
                                 </select>
                             </script>
@@ -184,7 +184,7 @@
                     <div class="layui-input-block layui-form" id="venueServiceCheckboxTemplateBox" lay-filter="venueServiceCheckboxTemplateBox"></div>
                     <script id="venueServiceCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="venueService[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="venueService[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -277,7 +277,7 @@
 
         // 加载场馆类型
         function initVenueTypeSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueTypeTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueTypeTemplateBox').innerHTML = html;
                 });
@@ -397,7 +397,7 @@
 
         // 初始化场馆服务复选
         function initVenueServiceCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueServiceCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueServiceCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuesinfo/update-venuesinfo.html b/src/main/resources/static/route/venuebooking/venuesinfo/update-venuesinfo.html
index 0393bef..98a30e8 100644
--- a/src/main/resources/static/route/venuebooking/venuesinfo/update-venuesinfo.html
+++ b/src/main/resources/static/route/venuebooking/venuesinfo/update-venuesinfo.html
@@ -76,7 +76,7 @@
                                 <select id="venueType" name="venueType" lay-verify="required">
                                     <option value="">请选择</option>
                                     {{# for(var i = 0, item; item = d[i++];) { }}
-                                    <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                    <option value="{{item.dataId}}">{{item.dataName}}</option>
                                     {{# } }}
                                 </select>
                             </script>
@@ -186,7 +186,7 @@
                     <div class="layui-input-block layui-form" id="venueServiceCheckboxTemplateBox" lay-filter="venueServiceCheckboxTemplateBox"></div>
                     <script id="venueServiceCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="venueService[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="venueService[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -330,7 +330,7 @@
 
         // 回显场馆类别
         function initVenueTypeSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueTypeTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueTypeTemplateBox').innerHTML = html;
                 });
@@ -457,7 +457,7 @@
 
         // 初始化场馆服务复选
         function initVenueServiceCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueServiceCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueServiceCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuesproject/save-venuesproject.html b/src/main/resources/static/route/venuebooking/venuesproject/save-venuesproject.html
index ac7e297..c3925d7 100644
--- a/src/main/resources/static/route/venuebooking/venuesproject/save-venuesproject.html
+++ b/src/main/resources/static/route/venuebooking/venuesproject/save-venuesproject.html
@@ -28,7 +28,7 @@
                         <select id="projectCategory" name="projectCategory" lay-verify="required" lay-search>
                             <option value="">支持中文搜索</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -44,7 +44,7 @@
                     <div class="layui-input-block layui-form" id="facilitiesCheckboxTemplateBox" lay-filter="facilitiesCheckboxTemplateBox"></div>
                     <script id="facilitiesCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="facilities[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="facilities[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -75,7 +75,7 @@
 
         // 初始化项目分类
         function initProjectSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('projectSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('projectSelectTemplateBox').innerHTML = html;
                 });
@@ -88,7 +88,7 @@
 
         // 初始化场地设施
         function initFacilitiesCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('facilitiesCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('facilitiesCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuesproject/update-venuesproject.html b/src/main/resources/static/route/venuebooking/venuesproject/update-venuesproject.html
index 42453cc..1cc3d6e 100644
--- a/src/main/resources/static/route/venuebooking/venuesproject/update-venuesproject.html
+++ b/src/main/resources/static/route/venuebooking/venuesproject/update-venuesproject.html
@@ -28,7 +28,7 @@
                         <select id="projectCategory" name="projectCategory" lay-verify="required">
                             <option value="">请选择</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -44,7 +44,7 @@
                     <div class="layui-input-block layui-form" id="facilitiesCheckboxTemplateBox" lay-filter="facilitiesCheckboxTemplateBox"></div>
                     <script id="facilitiesCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="facilities[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="facilities[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -97,7 +97,7 @@
 
         // 初始化项目类别
         function initProjectSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('projectSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('projectSelectTemplateBox').innerHTML = html;
                 });
@@ -112,7 +112,7 @@
 
         // 初始化场地设施
         function initFacilitiesCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('facilitiesCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('facilitiesCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuesprojectv2/update-venuesproject.html b/src/main/resources/static/route/venuebooking/venuesprojectv2/update-venuesproject.html
index 42453cc..1cc3d6e 100644
--- a/src/main/resources/static/route/venuebooking/venuesprojectv2/update-venuesproject.html
+++ b/src/main/resources/static/route/venuebooking/venuesprojectv2/update-venuesproject.html
@@ -28,7 +28,7 @@
                         <select id="projectCategory" name="projectCategory" lay-verify="required">
                             <option value="">请选择</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -44,7 +44,7 @@
                     <div class="layui-input-block layui-form" id="facilitiesCheckboxTemplateBox" lay-filter="facilitiesCheckboxTemplateBox"></div>
                     <script id="facilitiesCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="facilities[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="facilities[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -97,7 +97,7 @@
 
         // 初始化项目类别
         function initProjectSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f59ebf77-c2b7-49bc-8f58-2928bd2b450d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('projectSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('projectSelectTemplateBox').innerHTML = html;
                 });
@@ -112,7 +112,7 @@
 
         // 初始化场地设施
         function initFacilitiesCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/97361873-a331-45e8-8adf-1d8615e9f2b1', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('facilitiesCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('facilitiesCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuev2/save.html b/src/main/resources/static/route/venuebooking/venuev2/save.html
index 183eade..c3f53de 100644
--- a/src/main/resources/static/route/venuebooking/venuev2/save.html
+++ b/src/main/resources/static/route/venuebooking/venuev2/save.html
@@ -104,7 +104,7 @@
                                 <select id="venueType" name="venueType" lay-verify="required">
                                     <option value="">请选择</option>
                                     {{# for(var i = 0, item; item = d[i++];) { }}
-                                    <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                    <option value="{{item.dataId}}">{{item.dataName}}</option>
                                     {{# } }}
                                 </select>
                             </script>
@@ -177,7 +177,7 @@
                     <div class="layui-input-block layui-form" id="venueServiceCheckboxTemplateBox" lay-filter="venueServiceCheckboxTemplateBox"></div>
                     <script id="venueServiceCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="venueService[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="venueService[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -274,7 +274,7 @@
 
         // 加载场馆类型
         function initVenueTypeSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueTypeTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueTypeTemplateBox').innerHTML = html;
                 });
@@ -382,7 +382,7 @@
 
         // 初始化场馆服务复选
         function initVenueServiceCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueServiceCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueServiceCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/venuebooking/venuev2/update.html b/src/main/resources/static/route/venuebooking/venuev2/update.html
index e32fe09..bb6eaaf 100644
--- a/src/main/resources/static/route/venuebooking/venuev2/update.html
+++ b/src/main/resources/static/route/venuebooking/venuev2/update.html
@@ -106,7 +106,7 @@
                                 <select id="venueType" name="venueType" lay-verify="required">
                                     <option value="">请选择</option>
                                     {{# for(var i = 0, item; item = d[i++];) { }}
-                                    <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                    <option value="{{item.dataId}}">{{item.dataName}}</option>
                                     {{# } }}
                                 </select>
                             </script>
@@ -180,7 +180,7 @@
                     <div class="layui-input-block layui-form" id="venueServiceCheckboxTemplateBox" lay-filter="venueServiceCheckboxTemplateBox"></div>
                     <script id="venueServiceCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="venueService[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="venueService[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -329,7 +329,7 @@
 
         // 回显场馆类别
         function initVenueTypeSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/df8b758c-f6d8-465a-9aa8-c451fde47076', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueTypeTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueTypeTemplateBox').innerHTML = html;
                 });
@@ -442,7 +442,7 @@
 
         // 初始化场馆服务复选
         function initVenueServiceCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/350cee42-b045-4926-9254-b0780b93ac6f', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('venueServiceCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('venueServiceCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/agreecontent/update-agreecontent.html b/src/main/resources/static/route/volunteer/agreecontent/update-agreecontent.html
index 7715937..e0de269 100644
--- a/src/main/resources/static/route/volunteer/agreecontent/update-agreecontent.html
+++ b/src/main/resources/static/route/volunteer/agreecontent/update-agreecontent.html
@@ -147,7 +147,7 @@
 
         // 初始化类型单选
         function initTypeRadio(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('typeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('typeRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/team/save-team.html b/src/main/resources/static/route/volunteer/team/save-team.html
index f87b878..f6af1bb 100644
--- a/src/main/resources/static/route/volunteer/team/save-team.html
+++ b/src/main/resources/static/route/volunteer/team/save-team.html
@@ -301,7 +301,7 @@
 
         // 初始化所属区域下拉选择
         function initTeamAreaSelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -313,7 +313,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initTeamCountySelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCountySelectTemplateBox').innerHTML = html;
                 });
@@ -325,7 +325,7 @@
 
         // 初始化服务区域-市下拉选择
         function initTeamCitySelect() {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCitySelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/team/update-team.html b/src/main/resources/static/route/volunteer/team/update-team.html
index d705adb..3d3f1c2 100644
--- a/src/main/resources/static/route/volunteer/team/update-team.html
+++ b/src/main/resources/static/route/volunteer/team/update-team.html
@@ -270,7 +270,7 @@
 
         // 初始化所属区域下拉选择
         function initTeamAreaSelect(selectValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -286,7 +286,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initTeamCountySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCountySelectTemplateBox').innerHTML = html;
                 });
@@ -305,7 +305,7 @@
 
         // 初始化服务区域-市下拉选择
         function initTeamCitySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('teamCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('teamCitySelectTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/volunteer/save-volunteer.html b/src/main/resources/static/route/volunteer/volunteer/save-volunteer.html
index 5edfb79..9d88da0 100644
--- a/src/main/resources/static/route/volunteer/volunteer/save-volunteer.html
+++ b/src/main/resources/static/route/volunteer/volunteer/save-volunteer.html
@@ -74,7 +74,7 @@
                     <div class="layui-input-block layui-form" id="serviceTypeCheckboxTemplateBox" lay-filter="serviceTypeCheckboxTemplateBox"></div>
                     <script id="serviceTypeCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceType[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceType[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -83,7 +83,7 @@
                     <div class="layui-input-block layui-form" style="margin-left: 135px;" id="serviceIndustryCheckboxTemplateBox" lay-filter="serviceIndustryCheckboxTemplateBox"></div>
                     <script id="serviceIndustryCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceIndustry[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceIndustry[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -99,7 +99,7 @@
                             <select id="occupation" name="occupation" lay-filter="occupation">
                                 <option value="">请选择职业</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -171,7 +171,7 @@
 
         // 初始化职业
         function initOccupationSelect() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/3a2a6615-a4fe-465b-b56d-a2b7ae409b9d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/3a2a6615-a4fe-465b-b56d-a2b7ae409b9d', []), {}, null, function(code, data, args) {
             debugger
                 laytpl(document.getElementById('occupationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('occupationSelectTemplateBox').innerHTML = html;
@@ -194,7 +194,7 @@
 
         // 初始化志愿者服务类别复选
         function initServiceTypeCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceTypeCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceTypeCheckboxTemplateBox').innerHTML = html;
                 });
@@ -206,7 +206,7 @@
 
         // 初始化志愿者服务区域下拉选择
         function initServiceAreaSelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -218,7 +218,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initServiceCountySelect(value) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + value, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + value, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceCountySelectTemplateBox').innerHTML = html;
                 });
@@ -230,7 +230,7 @@
 
         // 初始化服务区域-市下拉选择
         function initServiceCitySelect() {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceCitySelectTemplateBox').innerHTML = html;
                 });
@@ -242,7 +242,7 @@
 
         // 初始化志愿者服务领域或行业复选
         function initServiceIndustryCheckbox() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceIndustryCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceIndustryCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/volunteer/update-volunteer.html b/src/main/resources/static/route/volunteer/volunteer/update-volunteer.html
index 61aec76..5e78715 100644
--- a/src/main/resources/static/route/volunteer/volunteer/update-volunteer.html
+++ b/src/main/resources/static/route/volunteer/volunteer/update-volunteer.html
@@ -74,7 +74,7 @@
                     <div class="layui-input-block layui-form" id="serviceTypeCheckboxTemplateBox" lay-filter="serviceTypeCheckboxTemplateBox"></div>
                     <script id="serviceTypeCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceType[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceType[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -83,7 +83,7 @@
                     <div class="layui-input-block layui-form" style="margin-left: 135px;" id="serviceIndustryCheckboxTemplateBox" lay-filter="serviceIndustryCheckboxTemplateBox"></div>
                     <script id="serviceIndustryCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceIndustry[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceIndustry[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -99,7 +99,7 @@
                             <select id="occupation" name="occupation" lay-filter="occupation">
                                 <option value="">请选择职业</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -173,7 +173,7 @@
 
         // 初始化职业
         function initOccupationSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/3a2a6615-a4fe-465b-b56d-a2b7ae409b9d', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/3a2a6615-a4fe-465b-b56d-a2b7ae409b9d', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('occupationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('occupationSelectTemplateBox').innerHTML = html;
                 });
@@ -199,7 +199,7 @@
 
         // 初始化志愿者服务类别复选
         function initServiceTypeCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceTypeCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceTypeCheckboxTemplateBox').innerHTML = html;
                 });
@@ -218,7 +218,7 @@
 
         // 初始化志愿者服务区域下拉选择
         function initServiceAreaSelect(selectValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -234,7 +234,7 @@
 
         // 初始化服务区域-旗县区下拉选择
         function initServiceCountySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/' + selectValue, []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/' + selectValue, []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceCountySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceCountySelectTemplateBox').innerHTML = html;
                 });
@@ -253,7 +253,7 @@
 
         // 初始化服务区域-市下拉选择
         function initServiceCitySelect(selectValue, countyValue, areaValue) {
-            top.restAjax.get(top.restAjax.path('app/dataarea/listareabyparentidrelease/110889', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/area/listallbyparentid/110889', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceCitySelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceCitySelectTemplateBox').innerHTML = html;
                 });
@@ -285,7 +285,7 @@
 
         // 初始化志愿者服务领域或行业复选
         function initServiceIndustryCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceIndustryCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceIndustryCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/static/route/volunteer/volunteer/view-volunteer.html b/src/main/resources/static/route/volunteer/volunteer/view-volunteer.html
index e2672dd..d40a50c 100644
--- a/src/main/resources/static/route/volunteer/volunteer/view-volunteer.html
+++ b/src/main/resources/static/route/volunteer/volunteer/view-volunteer.html
@@ -103,7 +103,7 @@
                             <select id="nation" name="nation">
                                 <option value="">请选择志愿者民族</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -115,7 +115,7 @@
                             <select id="nativePlace" name="nativePlace">
                                 <option value="">请选择志愿者籍贯</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -129,7 +129,7 @@
                             <select id="politicalOutlook" name="politicalOutlook">
                                 <option value="">请选择志愿者政治面貌</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -163,7 +163,7 @@
                             <select id="addressAbout" name="addressAbout">
                                 <option value="">请选择志愿者居住地址</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -189,7 +189,7 @@
                             <select id="highestEducation" name="highestEducation">
                                 <option value="">请选择志愿者最高学历</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -201,7 +201,7 @@
                             <select id="work" name="work">
                                 <option value="">从业状况</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -222,7 +222,7 @@
                             <select id="serviceArea" name="serviceArea">
                                 <option value="">请选择志愿者服务区域</option>
                                 {{# for(var i = 0, item; item = d[i++];) { }}
-                                <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                                <option value="{{item.dataId}}">{{item.dataName}}</option>
                                 {{# } }}
                             </select>
                         </script>
@@ -233,7 +233,7 @@
                     <div class="layui-input-block layui-form" id="serviceTypeCheckboxTemplateBox" lay-filter="serviceTypeCheckboxTemplateBox"></div>
                     <script id="serviceTypeCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceType[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceType[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -242,7 +242,7 @@
                     <div class="layui-input-block layui-form" id="serviceIndustryCheckboxTemplateBox" lay-filter="serviceIndustryCheckboxTemplateBox"></div>
                     <script id="serviceIndustryCheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="serviceIndustry[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="serviceIndustry[{{item.dataId}}]" value="{{item.dataId}}" title="{{item.dataName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -329,7 +329,7 @@
 
         // 初始化志愿者居住地址下拉选择
         function initAddressAboutSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/761d8633-3c2f-4e92-b32d-fb50d3dc07b7', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/761d8633-3c2f-4e92-b32d-fb50d3dc07b7', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('addressAboutSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('addressAboutSelectTemplateBox').innerHTML = html;
                 });
@@ -345,7 +345,7 @@
 
         // 初始化志愿者服务类别复选
         function initServiceTypeCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/a223b308-014a-4e89-93fa-035a564e7fda', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceTypeCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceTypeCheckboxTemplateBox').innerHTML = html;
                 });
@@ -364,7 +364,7 @@
 
         // 初始化志愿者政治面貌下拉选择
         function initPoliticalOutlookSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/f9ff0a87-7ccf-4257-9471-f337e9c2b857', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/f9ff0a87-7ccf-4257-9471-f337e9c2b857', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('politicalOutlookSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('politicalOutlookSelectTemplateBox').innerHTML = html;
                 });
@@ -380,7 +380,7 @@
 
         // 初始化志愿者从业状况下拉选择
         function initWorkSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/3a019a6f-d1f7-4a45-8426-e2300f533bca', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/3a019a6f-d1f7-4a45-8426-e2300f533bca', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('workSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('workSelectTemplateBox').innerHTML = html;
                 });
@@ -396,7 +396,7 @@
 
         // 初始化志愿者民族下拉选择
         function initNationSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/e64a01f7-dac9-40da-a2fe-50225fb287aa', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/e64a01f7-dac9-40da-a2fe-50225fb287aa', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('nationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('nationSelectTemplateBox').innerHTML = html;
                 });
@@ -412,7 +412,7 @@
 
         // 初始化志愿者最高学历下拉选择
         function initHighestEducationSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/7cf06b2e-418e-4be8-b4f8-be49cef7d1f0', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/7cf06b2e-418e-4be8-b4f8-be49cef7d1f0', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('highestEducationSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('highestEducationSelectTemplateBox').innerHTML = html;
                 });
@@ -428,7 +428,7 @@
 
         // 初始化志愿者籍贯下拉选择
         function initNativePlaceSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/c1ff60d9-dd3e-460c-941a-493ba7ebd2fd', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/c1ff60d9-dd3e-460c-941a-493ba7ebd2fd', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('nativePlaceSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('nativePlaceSelectTemplateBox').innerHTML = html;
                 });
@@ -444,7 +444,7 @@
 
         // 初始化志愿者服务区域下拉选择
         function initServiceAreaSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/761d8633-3c2f-4e92-b32d-fb50d3dc07b7', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/761d8633-3c2f-4e92-b32d-fb50d3dc07b7', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceAreaSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceAreaSelectTemplateBox').innerHTML = html;
                 });
@@ -460,7 +460,7 @@
 
         // 初始化志愿者服务领域或行业复选
         function initServiceIndustryCheckbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/7b213c37-8575-4db3-bda1-86c4e38589f7', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('serviceIndustryCheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('serviceIndustryCheckboxTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/templates/library/index/index.html b/src/main/resources/templates/library/index/index.html
new file mode 100644
index 0000000..c6e0d4d
--- /dev/null
+++ b/src/main/resources/templates/library/index/index.html
@@ -0,0 +1,135 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'} ">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div id="LAY-app" class="layui-fluid">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    文字数据
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="textCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    图文数据
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="imageCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    音频数据
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="audioCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    视频数据
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="videoCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="assets/js/vue.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'animate-numbers', 'table', 'form'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var form = layui.form;
+        var table = layui.table;
+        new Vue({
+            el: '#LAY-app',
+            data: {
+                publishCount: 0,
+                unPublishCount: 0,
+                formCount: 0,
+                joinCount: 0
+            },
+            methods: {
+                textCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/intangiblelibrarydata/countintangiblelibrarydatarelease?libraryDataType=1', {}, null, function(code, data) {
+                        self.publishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#textCount').animateNumbers(self.publishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                imageCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/intangiblelibrarydata/countintangiblelibrarydatarelease?libraryType=2', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#imageCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                audioCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/intangiblelibrarydata/countintangiblelibrarydatarelease?libraryType=3', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#audioCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                videoCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/intangiblelibrarydata/countintangiblelibrarydatarelease?libraryType=4', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#videoCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+            },
+            mounted: function() {
+                var self = this;
+                self.textCount();
+                self.imageCount();
+                self.audioCount();
+                self.videoCount();
+            }
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/show/articlecategory/save-articlecategory.html b/src/main/resources/templates/show/articlecategory/save-articlecategory.html
index bbc0402..61077e0 100644
--- a/src/main/resources/templates/show/articlecategory/save-articlecategory.html
+++ b/src/main/resources/templates/show/articlecategory/save-articlecategory.html
@@ -47,7 +47,7 @@
                         <select id="categoryShowType" name="categoryShowType">
                             <option value="">请选择显示方式</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -112,7 +112,7 @@
 
         // 初始化公布时间
         function libraryOpenDateRadio() {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/393d3d38-38c3-499a-afb1-060325510313', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/393d3d38-38c3-499a-afb1-060325510313', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('categoryShowTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('categoryShowTypeRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/templates/show/articlecategory/update-articlecategory.html b/src/main/resources/templates/show/articlecategory/update-articlecategory.html
index 8159f77..2d7adbc 100644
--- a/src/main/resources/templates/show/articlecategory/update-articlecategory.html
+++ b/src/main/resources/templates/show/articlecategory/update-articlecategory.html
@@ -47,7 +47,7 @@
                         <select id="categoryShowType" name="categoryShowType">
                             <option value="">请选择显示方式</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.dataId}}">{{item.dataName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -105,7 +105,7 @@
 
         // 初始化公布时间
         function libraryOpenDateRadio(joinValue) {
-            top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/393d3d38-38c3-499a-afb1-060325510313', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/data/listbyparentid/393d3d38-38c3-499a-afb1-060325510313', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('categoryShowTypeRadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('categoryShowTypeRadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/templates/show/index/index.html b/src/main/resources/templates/show/index/index.html
new file mode 100644
index 0000000..e240764
--- /dev/null
+++ b/src/main/resources/templates/show/index/index.html
@@ -0,0 +1,228 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'} ">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-card-header {height: 36px; line-height: 36px;}
+        .layuiadmin-card-list p.layuiadmin-big-font {font-size: 25px;line-height: 25px;padding: 0px;}
+    </style>
+</head>
+<body>
+<div id="LAY-app" class="layui-fluid">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-sm3 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    展览设备
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="deviceCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm3 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    展览模板
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="showTemplateCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm3 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    素材包
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="showDataCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm3 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    场馆公告
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p id="contentCount" class="layuiadmin-big-font">0</p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-sm12 layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    展览设备列表
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <table class="layui-hide" id="deviceTable" lay-filter="deviceTable"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="assets/js/vue.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'animate-numbers', 'table', 'form'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var form = layui.form;
+        var table = layui.table;
+        new Vue({
+            el: '#LAY-app',
+            data: {
+                publishCount: 0,
+                unPublishCount: 0,
+                formCount: 0,
+                joinCount: 0
+            },
+            methods: {
+                showTemplateCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/showtemplate/countshowtemplaterelease', {}, null, function(code, data) {
+                        self.publishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#showTemplateCount').animateNumbers(self.publishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                deviceCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/showdevice/countshowdevicerelease', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#deviceCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                showDataCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/showdata/countshowdatarelease', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#showDataCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                contentCount: function() {
+                    var self = this;
+                    top.restAjax.get('app/showarticlecontent/countarticlecontentrelease', {}, null, function(code, data) {
+                        self.unPublishCount = data.data;
+                        self.$nextTick(function() {
+                            $('#contentCount').animateNumbers(self.unPublishCount);
+                        });
+                    }, function(code, data) {
+                        top.dialog.msg(data.msg);
+                    });
+                },
+                initDeviceTable: function() {
+                    table.render({
+                        elem: '#deviceTable',
+                        id: 'deviceTable',
+                        url: top.restAjax.path('api/showdevice/listpageshowdevice', []),
+                        width: '100%',
+                        height: $win.height() - 205,
+                        limit: 20,
+                        limits: [20, 40, 60, 80, 100, 200],
+                        request: {
+                            pageName: 'page',
+                            limitName: 'rows'
+                        },
+                        cols: [
+                            [
+                                {field:'rowNum', width:80, title: '序号', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                                {field:'deviceCode', width:200, title: '展览设备编码', align:'left',},
+                                {field:'deviceName', width:400, title: '展览设备名称', align:'left',},
+                                {field:'deviceType', width:150, title: '展览设备类型', align:'left',  templet: function(row) {
+                                        if(row.deviceType == 1) {
+                                            return '展览机'
+                                        }
+                                        return '壁挂机';
+                                    }},
+                                {field: 'venueName', width: 250, title: '展览设备安装场馆', align:'center',
+                                    templet: function(row) {
+                                        var rowData = row[this.field];
+                                        var venueParentName = row.venueParentName;
+                                        if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                            return '-';
+                                        }
+                                        return rowData + " - " + venueParentName;
+                                    }
+                                },
+                                {field:'deviceAddress', width:500, title: '展览设备安装地址', align:'left'}/*,
+                                {field: 'deviceViewSwitch', width: 150, title: '设备状态', fixed: 'right', align:'center',
+                                    templet: function(row) {
+                                        var rowData = row[this.field];
+                                        if(rowData == '1') {
+                                            return  '<button type="button" class="layui-btn layui-btn-radius layui-btn-radius layui-btn-xs">在线</button>';
+                                        }else {
+                                            return '<button type="button" class="layui-btn layui-btn-danger layui-btn-radius layui-btn-xs">离线</button>';
+                                        }
+                                    }
+                                },*/
+                            ]
+                        ],
+                        page: true,
+                        parseData: function(data) {
+                            return {
+                                'code': 0,
+                                'msg': '',
+                                'count': data.total,
+                                'data': data.rows
+                            };
+                        }
+                    });
+                }
+            },
+            mounted: function() {
+                var self = this;
+                self.showDataCount();
+                self.deviceCount();
+                self.showTemplateCount();
+                self.initDeviceTable();
+                self.contentCount();
+            }
+        });
+
+        // 显示开关
+        form.on('switch(deviceViewSwitchEvent)', function () {
+            var loadLayerIndex;
+            var obj = {};
+            top.restAjax.put(top.restAjax.path('api/showdevice/updatedeviceviewswitch/{showDeviceId}/{deviceViewSwitch}', [$(this).attr("deviceId"), this.checked]), obj, null, function(code, data) {
+                window.location.reload();
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            }, function() {
+                loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
+            }, function() {
+                top.dialog.close(loadLayerIndex);
+            });
+        });
+
+
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/volunteer/index/index.html b/src/main/resources/templates/volunteer/index/index.html
new file mode 100644
index 0000000..d8caee2
--- /dev/null
+++ b/src/main/resources/templates/volunteer/index/index.html
@@ -0,0 +1,131 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'} ">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+<div id="LAY-app" class="layui-fluid">
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    志愿者
+                    <span class="layui-badge layui-bg-blue layuiadmin-badge">男女比例</span>
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p>
+                        男性
+                        <span class="layuiadmin-span-color">
+                            <span id="boyCount"></span>
+                        </span>
+                    </p>
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p class="">
+                        女性
+                        <span class="layuiadmin-span-color layuiadmin-big-font">
+                           <span id="girlCount"></span>
+                        </span>
+                    </p>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="layui-card">
+                <div class="layui-card-header">
+                    团队
+                    <span class="layui-badge layui-bg-orange layuiadmin-badge">团队数量</span>
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p>
+                        团队数量
+                        <span class="layuiadmin-span-color">
+                            <span id="teamCount"></span>
+                        </span>
+                    </p>
+                </div>
+                <div class="layui-card-body layuiadmin-card-list">
+                    <p class="">
+                        参加人数
+                        <span class="layuiadmin-span-color layuiadmin-big-font">
+                           <span id="joinCount"></span>
+                        </span>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+<script type="text/javascript" src="assets/js/vue.min.js"></script>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/echarts/echarts.min.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/' //静态资源所在路径
+    }).extend({
+        index: 'lib/index' //主入口模块
+    }).use(['index', 'animate-numbers'], function() {
+        var $ = layui.$;
+        new Vue({
+            el: '#LAY-app',
+            data: {
+                boyCount: 0,
+                girlCount: 0
+            },
+            methods: {
+                /*sex: function() {
+                    $.ajax({
+                        url: 'api/volunteer/sexCharts',
+                        type:'get',
+                        data:{},
+                        success:function(data){
+                            if(data.status == 'error'){
+                                layer.msg(data.msg,{icon: 5});//失败的表情
+                                o.removeClass('layui-btn-disabled');
+                                return;
+                            }else{
+                                var self = this;
+                                $('#boyCount').html(data.data.boyCount);
+                                $('#girlCount').html(data.data.girlCount);
+                            }
+                        },
+                    });
+                },
+                team: function() {
+                    $.ajax({
+                        url: 'api/team/teamCharts',
+                        type:'get',
+                        data:{},
+                        success:function(data){
+                            if(data.status == 'error'){
+                                layer.msg(data.msg,{icon: 5});//失败的表情
+                                o.removeClass('layui-btn-disabled');
+                                return;
+                            }else{
+                                var self = this;
+                                $('#teamCount').html(data.data.teamCount);
+                                $('#joinCount').html(data.data.joinCount);
+                            }
+                        },
+                    });
+                }*/
+            },
+            mounted: function() {
+                var self = this;
+                self.sex();
+                self.team();
+            }
+        })
+    });
+</script>
+</body>
+</html>
\ No newline at end of file