Merge branch 'dev/diagbotcloud20191010_conwl' into develop

common/src/main/java/com/diagbot/enums/ProductTypeEnum.java

@@ -13,7 +13,7 @@ public enum ProductTypeEnum implements KeyedNamed {
     DIAGBOTCLOUD_OUTER(2, "云平台外部"),
     ICSS(3, "ICSS"),
     TRIAGE(4, "智能分诊"),
-    DATA(5, "数据服务模式"),
+    DATA(5, "页面推送模式"),
     PREC(6, "智能预问诊");
     @Setter
     private int key;

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -850,8 +850,8 @@ public class ConceptFacade extends ConceptServiceImpl {
                                         sbf.append("第" + count + "行无法导入，导入数据无法为纯数字；").append("<br/>");
                                         break;
                                     }
-                                    if (nm.length() > 30) {
-                                        sbf.append("第" + count + "行导入错误，标准词和同义词最大字数不可超过30个字；").append("<br/>");
+                                    if (nm.length() > 50) {
+                                        sbf.append("第" + count + "行导入错误，标准词和同义词最大字数不可超过50个字；").append("<br/>");
                                         break;
                                     }
                                     AddConceptInfoDetailVO addConceptInfoDetailVO = new AddConceptInfoDetailVO();