Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnUserServiceImpl.java

@@ -92,7 +92,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
                 .map(item->item.getWarnType()).collect(Collectors.toList());
 
         vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
-        vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
+        vehicleWarnUser.setLineWarnTypeJson(JSON.toJSONString(lineWarnTypeList));
         vehicleWarnUserDao.updateWarnType(vehicleWarnUser);
 
     }