648540858 020f9ea8a0 Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java

2022-08-23 11:01:53 +08:00

..

java/com/genersoft/iot/vmp

Merge branch 'wvp-28181-2.0'

2022-08-23 11:01:53 +08:00

resources

修复使用ssl的配置

2022-08-22 23:00:13 +08:00