Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -262,9 +262,6 @@ public class ConstructionController extends BaseController {
      * 配网运行人员判定设计变更
      * 人工审核页面
      * */
-    /**
-     * 查看，增加，编辑请假申请表单页面
-     */
     @RequestMapping(value = "humanReview")
     public String humanReviewform(Construction construction, Model model) {
 //        String proId = construction.getAct().getProcDefId();

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/ShowListController.java

@@ -122,7 +122,7 @@ public class ShowListController extends BaseController {
                     finalList.add(showList);
                 }
             }
-            Collections.sort(returnList);
+            Collections.sort(finalList);
             page.setList(finalList);
             return getBootstrapData(page);
         } else {