Merge branch 'master' into 'test'

# Conflicts:
#   src/main/resources/mapper/Questionnaire.xml

src/main/java/com/tiptimes/ctrl/GoToCtrl.java

@@ -211,10 +211,6 @@ public class GoToCtrl {
 
     @RequestMapping({"/education/questionnaire_Administration_list"})
     public String getEducationQuestionnaire_Administration_list(HttpServletRequest request) {
-//        String recordId = request.getParameter("recordId");
-//        request.setAttribute("recordId", recordId);
-//        String processStatus = request.getParameter("processStatus");
-//        request.setAttribute("processStatus", processStatus);
         return "/education/questionnaire_Administration_list";
     }