Merge branch 'master' into dev/abl支持

Browse Source

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

...

This commit is contained in:

648540858

2024-04-02 11:20:51 +08:00

parent 969ff86ebe 67688d4a4b

commit 1bb813758a

6 changed files with 31 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java