Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -319,7 +319,7 @@
             AND ppr.status_cd = '0'
             )
         </if>
-        order by t.m_id desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

service-front/src/main/java/com/java110/front/configuration/ServiceConfiguration.java

@@ -48,7 +48,8 @@ public class ServiceConfiguration {
         exclusions.append("/app/activitiesType/queryActivitiesType,");//查询大类
         exclusions.append("/app/product/queryProductLabel,");//查询大类
         exclusions.append("/app/loginStaffWechatAuth,");//查询大类
-        exclusions.append("/app/reportInfoSettingTitle/querySettingTitle,");//查询疫情问卷
+        exclusions.append("/app/reportInfoSetting/queryReportInfoSetting,");//查询疫情
+        exclusions.append("/app/reportInfoSettingTitle/querySettingTitle,");//查询疫情问卷详情
         exclusions.append("/app/reportInfoBackCity/saveReportInfoBackCity,");//返省人员信息上报
         exclusions.append("/app/reportInfoAnswerValue/saveReportInfoAnswerValue,");//保存疫情问卷
         exclusions.append("/app/staffAuth");//查询大类