Merge remote-tracking branch 'origin/developer' into developerMysql

src/main/java/com/caimei/modules/permission/PermissionController.java

@@ -0,0 +1,25 @@
+package com.caimei.modules.permission;
+
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.thinkgem.jeesite.common.web.BaseController;
+
+
+/**
+ * @author Administrator
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/permission/receiptUserPermission")
+public class PermissionController extends BaseController {
+
+
+    @RequiresPermissions("permission:receiptUserPermission:view")
+    @RequestMapping(value = {"list", ""})
+    public String list() {
+        return "modules/permission/receiptNoticePermissionList";
+    }
+
+}