Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -936,9 +936,9 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FTP_CONNECTION_MODE {
         LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
-        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式");
 //        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
-        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+//        REMOTE_PASSIVE_MODE(40, "远程被动模式");
 
         private final int value;
         private final String description;