Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/config/PageHelperConfig.java

@@ -17,6 +17,7 @@
        Properties properties = new Properties();

        properties.setProperty("offsetAsPageNum","true");

        properties.setProperty("rowBoundsWithCount","true");

        properties.setProperty("pageSizeZero","true");

        properties.setProperty("reasonable","true");

        properties.setProperty("dialect","mysql");    //配置mysql数据库的方言

        pageHelper.setProperties(properties);