Merge branch 'dev-m-table' into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ExcelTabClientImpl.java

@@ -12,8 +12,6 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 import org.jsoup.select.Elements;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springblade.business.dto.ReSigningEntrustDto;
 import org.springblade.business.dto.TrialSelfInspectionRecordDTO;
 import org.springblade.business.entity.ContractLog;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -19,7 +19,6 @@ import com.spire.xls.ExcelPicture;
 import com.spire.xls.FileFormat;
 import com.spire.xls.Worksheet;
 import com.spire.xls.collections.PicturesCollection;
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -195,6 +195,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             String fieldType = WbsElementUtil.getInitTableFiledType(wbsFormElement.getEType());
             if (newFiled > 80) {
                 alterMTableOpsFiled(tableName);
+                baseMapper.insert(wbsFormElement);
             } else {
                 if ("varchar".equals(fieldType)) {
                     if (wbsFormElement.getELength() > 1000 || wbsFormElement.getELength() < 10) {
@@ -922,6 +923,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                     long index = Long.parseLong(split[1]);
                     if (index > 80)  {
                         alterMTableOpsFiled(initTableName);
+                        continue;
                     };
                 }
                 //同步