Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java

@@ -20,7 +20,7 @@
 * @description 容器添加组件
 * @date 2019-06-14 15:50
 */
@Configuration
@Configuration()
@PropertySource("classpath:config/system.properties")
public class MvcCoreConfig implements WebMvcConfigurer {