Merge branch 'feature-0808' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -143,12 +143,10 @@ public class WelcomeServiceImpl implements WelcomeService {
         long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId(), bo.getType());
         if (count >= WELCOME_LIMIT) {
             if (HmWelcomeType.NORMAL.getCode().equals(bo.getType())){
-                return "数量已达上限," +
-                        "普通欢迎语最多可创建50条";
+                return "普通欢迎语最多可创建50条";
             }
             if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
-                return "数量已达上限," +
-                        "特殊欢迎语最多可创建50条";
+                return "特殊欢迎语最多可创建50条";
             }
             return "欢迎语条目超过限制";
         }