更新sql文件

2020-05-19 13:38:28 +08:00
parent 6f1cf12669
commit f77cd67329
1 changed files with 0 additions and 2 deletions
--- a/sql/yxshop2.2.sql
+++ b/sql/yxshop2.2.sql
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /*
 Navicat Premium Data Transfer

@ -6236,4 +6235,3 @@ CREATE TABLE `yx_wechat_user`  (
 INSERT INTO `yx_wechat_user` VALUES (1, NULL, NULL, NULL, 'hupeng', '', 0, '', '', '', '', NULL, 0, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'wechat');

 SET FOREIGN_KEY_CHECKS = 1;
->>>>>>> featrue/mp