Merge remote-tracking branch 'origin/master'

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java

@@ -81,8 +81,9 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
         Page<CostCarChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
 //        List<Long> residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList());
 //        List<RemoteUserVo> remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList);
+
         List<ResidentPerson> residentPeoplelist = residentPersonMapper.selectList();
-        List<String> roomNames = roomService.queryRoomNameList(idList);
+//        List<String> roomNames = roomService.queryRoomNameList(idList);
         result.getRecords().stream().forEach(s -> {
             if (CollUtil.isNotEmpty(residentPeoplelist)) {
                 ResidentPerson residentPerson = residentPeoplelist.stream()

ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties

@@ -40,9 +40,9 @@ spring.sql.init.platform=mysql
 db.num=1
 
 ### Connect URL of DB:
-db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://192.168.159.129:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
-db.password.0=By@2025!
+db.password.0=123456
 
 ### the maximum retry times for push
 nacos.config.push.maxRetryTime=50