Merge remote-tracking branch 'origin/master'

src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,8 +23,9 @@ public class AppMassagePackageDetailController {
     @Login
     @GetMapping("/findAppPage")
     @ApiOperation("查询按服务包详情（分页）")
-    public Result findAppPage(MassagePackageDetail massagePackageDetail){
+    public Result findAppPage(@RequestAttribute("userId") Long userId, MassagePackageDetail massagePackageDetail){
         massagePackageDetail.setStatus(1);
+        massagePackageDetail.setUserId(userId);
         return service.findAppPage(massagePackageDetail);
     }