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

gongchunyi

昨天 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -20,14 +20,14 @@
 *
 * @author ruoyi
 */
@Service
@Service("UserDetailsServiceImpl")
public class UserDetailsServiceImpl implements UserDetailsService
{
    private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);

    @Autowired
    private ISysUserService userService;
    

    @Autowired
    private SysPasswordService passwordService;