Merge remote-tracking branch 'origin/dev' into dev

我的学习 人脸比对

src/main/java/com/zcloud/controller/eduApp/AppUsersCacheController.java

@@ -721,4 +721,18 @@ public class AppUsersCacheController extends BaseController {
     }
 
 
+    @RequestMapping(value = "/getUserFace")
+    @ResponseBody
+    public Object getUserFace() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        PageData data = userInfoService.findById(pd);
+        System.out.println("data = " + data);
+        map.put("pd", data);
+        map.put("result", errInfo);
+        return map;
+    }
+
 }