解决git冲突

liurunyu

2024-07-25 a37271af0a5a2eb04ca23c80cca32567c968fa8e

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/fastjson/FastJsonConfig.java

@@ -20,7 +20,7 @@
    /**
     * 配置fastjson输出格式
     **/
    @SuppressWarnings("unused")
    @Override
    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
        // 1. 配置fastjson
        com.alibaba.fastjson2.support.config.FastJsonConfig config = new com.alibaba.fastjson2.support.config.FastJsonConfig();