648540858 07b182da98 Merge branch 'wvp-28181-2.0' into feature/record ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java

2023-12-26 15:38:40 +08:00

..

genersoft/iot/vmp

Merge branch 'wvp-28181-2.0' into feature/record

2023-12-26 15:38:40 +08:00