Merge branch 'master' of http://49.4.49.126:3000/Gyee_web/Gyee_sis_phone

src/main/java/com/gyee/frame/common/conf/PageHelperConf.java

@@ -1,11 +1,10 @@
 package com.gyee.frame.common.conf;
 
-import java.util.Properties;
-
+import com.github.pagehelper.PageHelper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.github.pagehelper.PageHelper;
+import java.util.Properties;
 
 /**
 * 分页插件配置类
@@ -29,7 +28,8 @@ public class PageHelperConf {
         properties.setProperty("offsetAsPageNum", "true");
         properties.setProperty("rowBoundsWithCount", "true");
         properties.setProperty("reasonable", "true");
-        properties.setProperty("dialect", "mysql");    //配置mysql数据库的方言
+//        properties.setProperty("dialect", "mysql");    //配置mysql数据库的方言
+        properties.setProperty("autoRuntimeDialect","true");
         pageHelper.setProperties(properties);
         return pageHelper;
     }