Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-common/src/main/java/com/oying/config/webConfig/ConfigurerAdapter.java

@@ -70,6 +70,7 @@
        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
        // 开启引用检测，枚举支持
        config.setWriterFeatures(
                JSONWriter.Feature.WriteLongAsString,
                JSONWriter.Feature.WriteEnumUsingToString,
                JSONWriter.Feature.ReferenceDetection
        );