Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-07-28 646c3e41b7fac40acbdb7bbfec5608daab2a28d3

 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;