Merge branch 'fu-normal-push' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/PmWorkContentController.java

@@ -88,7 +88,7 @@ public class PmWorkContentController {
      * @return
      */
     @GetMapping("/page")
-    public ApiResult<CommonPage<PmWorkReport>> page(@RequestParam(value = "projectAscription", required = false) Integer projectAscription,
+    public ApiResult<CommonPage<PmWorkReport>> page(@RequestParam(value = "projectAscription", required = false, defaultValue = "-1") Integer projectAscription,
                                                     @RequestParam(value = "pageNum") Integer pageNum,
                                                     @RequestParam(value = "pageSize") Integer pageSize,
                                                     @RequestParam(value = "reportId", required = false) Integer reportId,