Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1

zf

2023-09-12 9b3a4c27da3d2da9017a289ed38b27d22f571e91

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -29,7 +29,7 @@
 * 
 * @author ruoyi
 */
@Configuration
/*@Configuration*/
public class MyBatisConfig
{
    @Autowired