Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/wx/controller/RiBaoController.java

@@ -72,8 +72,9 @@ public class RiBaoController {
 
     // 查询日报关联的家人列表
     @GetMapping("/riBao/queryRibaoDetailList")
-    public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "userCreate") Long userCreate) {
-        Long reportId = riBaoService.getNowByYesterday(userCreate);
+//    public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "userCreate") Long userCreate) {
+    public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "reportId") Long reportId) {
+//        Long reportId = riBaoService.getNowByYesterday(userCreate);
         List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
         return Model.newSuccess(listSuspected);
     }
@@ -86,8 +87,8 @@ public class RiBaoController {
 
     // 新增或者修改日报关联的家人 必须传reportId，userCreate，userUpdate
     @PostMapping("/riBao/addOrEditRibaoDetail")
-    public Model<MsSuspected> addOrEditRibaoDetail(@RequestBody MsSuspected ribaoDetail) {
-        return ModelOps.newSuccess(riBaoService.addOrEditRibaoDetail(ribaoDetail));
+    public Model<MsSuspected> addOrEditRibaoDetail(@RequestBody MsSuspected msSuspected) {
+        return ModelOps.newSuccess(riBaoService.addOrEditRibaoDetail(msSuspected));
     }
 
     // 删除日报关联的家人