Merge remote-tracking branch 'origin/master'

appapi/src/main/java/tech/glinfo/enbao/modules/appuser/controller/AppUserController.java

@@ -117,6 +117,7 @@ public class AppUserController extends AbstractController {
         member.setFamilyId(family.getId());
         member.setUserId(user.getId());
         member.setIsAdmin(1);//管理员
+        member.setStatus(2);
         shFamilyMemberService.save(member);
         String token = jwtUtils.generateToken(user.getId() +"#"+user.getPhone());
         Map<String, Object> map = new HashMap<>();
@@ -590,6 +591,7 @@ public class AppUserController extends AbstractController {
                 member.setFamilyId(family.getId());
                 member.setUserId(user.getId());
                 member.setIsAdmin(1);//管理员
+                member.setStatus(2);
                 shFamilyMemberService.save(member);
 
                 String token = jwtUtils.generateToken(user.getId() +"#"+phoneNumber);

appapi/src/main/java/tech/glinfo/enbao/modules/sys/controller/HelpCenterController.java

@@ -45,7 +45,9 @@ public class HelpCenterController {
     @GetMapping("/info/{id}")
     @ApiOperation("帮助中心")
     public R info(@PathVariable("id") Integer id){
-
-        return R.ok().put("list", helpCenterContentService.list(new QueryWrapper<HelpCenterContentEntity>().eq("help_id", id)));
+        R ok = R.ok();
+        ok.put("info", helpCenterService.getById(id));
+        ok.put("list", helpCenterContentService.list(new QueryWrapper<HelpCenterContentEntity>().eq("help_id", id)));
+        return ok;
     }
 }