Merge remote-tracking branch 'origin/develop_dl_4.0' into develop_dl_4.0

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -93,7 +93,7 @@ public class ContingencyPlanController extends BaseController {
                                     @RequestParam(value = "implementationTimeRight", required = false) Long implementationTimeRightStamp,
                                     @RequestParam(value = "size") int size,
                                     @RequestParam(value = "equipmentId", required = false) String equipmentId,
-                                    @RequestParam(value = "category") String category) {
+                                    @RequestParam(value = "category", required = false) String category) {
         if (current < 1 || size < 1) {
             throw new YeeException("分页参数有误");
         }