Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -844,7 +844,7 @@ public class AdminWebsitLogic {
                 throw new RemoteServiceException("第" + rowIndex + "行, 第三方网点是只有意外+雇主险");
             }
 
-            final String insureSteadUnitName = row.get(14).toString().trim();
+            final String insureSteadUnitName = row.get(14).toString();
             if (insureType.contains("工伤险")
                     && org.apache.commons.lang3.StringUtils.isBlank(insureSteadUnitName)) {
                 throw new RemoteServiceException("第" + rowIndex + "行, 工伤险代买单位不能为空");