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

# Conflicts:
#	src/main/resources/templates/home/common/header.html

src/main/resources/application.yml

@@ -15,12 +15,12 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-    active: dev
+#    active: dev
 #    active: test
 #    active: aliyun
 #    active: vpn
 #    active: prod_in
-#    active: prod_out
+    active: prod_out
 #    active: prod_test
 
   #数据源

src/main/resources/templates/admin/common/left.html

@@ -387,7 +387,7 @@
             </dd>
         </dl>
         <!--        end test-->
-        <dl shiro:hasPermission="G_SPECIAL_ACITIVITY">
+        <dl shiro:hasPermission="G_ACTIVITY_MANAGE">
             <dt class="titCellTop">
                 <!--<span> <a th:attr="data-href=@{/government/activity/list}" data-title="活动管理"><i
                         class="Hui-iconfont ft-18">&#xe6c3;</i> 活动管理</a></span>

src/main/resources/templates/home/common/header.html

@@ -71,7 +71,7 @@
 						<!--<a th:if="*{id==80}" onclick="checkLogin1('azw')" th:id="*{id}" name="safetySupervision" th:text="*{name}" ></a>-->
 					<!--</li>-->
 					<li role="presentation" >
-						<a href="/index/#/newsList" data-title="通知公告">通知公告</a>
+						<a th:href="@{/index/#/newsList}" data-title="通知公告">通知公告</a>
 					</li>
 					<li role="presentation" >
 						<a href="/serviceleague/home/policy" data-title="政策雷达" target="_blank">政策雷达</a>