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

huliguo

8 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/RuoYiShopApplication.java

@@ -18,7 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
//@EnableScheduling
@EnableScheduling
@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api"),@ComponentScan("com.ruoyi.common.security.utils")})
public class RuoYiShopApplication
{