Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java

@@ -68,4 +68,25 @@ public class SysAgreementController {
 		sysAgreementService.updateById(agre);
 		return R.ok();
 	}
+
+	/**
+	 * 获取隐私协议
+	 * @return
+	 */
+	@RequestMapping("/getPrivacyDetail")
+	public R getPrivacyDetail(){
+		SysAgreementEntity privacyDetail = sysAgreementService.getPrivacyDetail();
+		return R.ok().put("privacy",privacyDetail);
+	}
+
+	/**
+	 * 获取用户协议
+	 * @return
+	 */
+	@RequestMapping("/getUserDetail")
+	public R getUserDetail(){
+		SysAgreementEntity userDetail = sysAgreementService.getUserDetail();
+		return R.ok().put("user",userDetail);
+	}
+
 }