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

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/com/gxwebsoft/shop/controller/GoodsController.java

.idea/workspace.xml

@@ -196,4 +196,4 @@
   <component name="TaskManager">
     <servers />
   </component>
-</project>
+</project>

src/main/java/com/gxwebsoft/cms/vo/SideItemVo.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "幻灯片广告", description = "幻灯片广告")
+@ApiModel(value = "幻灯片广告项", description = "幻灯片广告项")
 public class SideItemVo implements Serializable {
 
     @ApiModelProperty("ID")

src/main/java/com/gxwebsoft/common/system/entity/Cache.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Setting对象", description = "缓存管理")
+@ApiModel(value = "Cache对象", description = "缓存管理")
 public class Cache implements Serializable {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/oa/param/CompanyParam.java

@@ -21,7 +21,7 @@ import java.util.Set;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CompanyParam对象", description = "企业信息查询参数")
+@ApiModel(value = "OaCompanyParam对象", description = "企业信息查询参数(OA)")
 public class CompanyParam extends BaseParam {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/shop/vo/CartVo.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "Cart对象", description = "购物车")
+@ApiModel(value = "CartVo对象", description = "购物车(返回结构)")
 @TableName("shop_cart")
 public class CartVo implements Serializable {
 

src/main/java/com/gxwebsoft/shop/vo/GoodsExcelImportResult.java

@@ -0,0 +1,36 @@
+package com.gxwebsoft.shop.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "GoodsExcelImportResult", description = "商品Excel导入结果")
+public class GoodsExcelImportResult implements Serializable {
+    @ApiModelProperty("Excel文件路径")
+    private String excelPath;
+
+    @ApiModelProperty("工作表名称")
+    private String sheetName;
+
+    @ApiModelProperty("导入到的商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("扫描到的有效行数(有品种/商品名)")
+    private int totalRows;
+
+    @ApiModelProperty("成功入库数量")
+    private int inserted;
+
+    @ApiModelProperty("跳过(已存在同名商品)")
+    private int skippedExists;
+
+    @ApiModelProperty("自动创建的分类数量")
+    private int createdCategories;
+
+    @ApiModelProperty("成功导出的图片数量")
+    private int savedImages;
+}
+