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

zf

2023-09-12 513437f432c227191f7a05d41d9127f080f4659b

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

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