Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/ChargeTypeSubjectMapperController.java

@@ -33,7 +33,7 @@ public class ChargeTypeSubjectMapperController extends BaseController {
     @GetMapping(value = "/queryPage", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('chargeTypeSubjectMapper/queryPage')")
     public Object queryPage(QueryInfo queryInfo) {
-        return succeed();
+        return succeed(chargeTypeSubjectMapperService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "新增对象")