Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

gushouzheng

2022-08-06 d21d281b2c4020bcbfc72bd95a458084a109933a

 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java

@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.conf;

import io.swagger.models.auth.In;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;