Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-service/src/main/java/com/fs/qw/domain/QwUser.java

fs-service/src/main/java/com/fs/sop/params/SendSopParamDetailsC.java

@@ -1,6 +1,7 @@
 package com.fs.sop.params;
 
 import com.fs.sop.vo.QwSopLogsDoSendListTVO;
+import com.tencentcloudapi.as.v20180419.models.DisableAutoScalingGroupRequest;
 import lombok.Data;
 
 import java.util.List;
@@ -18,5 +19,9 @@ public class SendSopParamDetailsC {
      * 延时时间
      */
     private Long sendDelayTime;
+    /**
+     * 是否使用插件
+     */
+    private Integer isAuto;
 
 }