Merge remote-tracking branch 'origin/master' into feature/springdoc

# Conflicts:
#	README.md

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java

@@ -21,4 +21,10 @@ public class DefaultController {
                 "[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
     }
 
+    @RequestMapping("/admin-api/mp/**")
+    public CommonResult<Boolean> mp404() {
+        return CommonResult.error(NOT_IMPLEMENTED.getCode(),
+                "[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
+    }
+
 }