Merge remote-tracking branch 'origin/master'

# Conflicts:
#	db/6pigxx_mp.sql
#	pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml

db/6pigxx_mp.sql

@@ -114,6 +114,8 @@ CREATE TABLE `wx_fans_msg_res` (
 -- ----------------------------
 --  Table structure for `wx_menu`
 -- ----------------------------
+DROP TABLE IF EXISTS `wx_menu`;
+CREATE TABLE `wx_menu` (
 DROP TABLE IF EXISTS `wx_mp_menu`;
 CREATE TABLE `wx_mp_menu` (
   `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键',