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

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/ItemInfoVo.java

@@ -20,4 +20,8 @@ public class ItemInfoVo {
 	private String img;
 
 	private String name;
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java

@@ -121,7 +121,7 @@ public class ConfirmOrderService {
 							itemInfoVo.setNumber(itemInfoDto.getNumber());
 							itemInfoVo.setImg(imageImgStorage.getCoverImg());
 							itemInfoVo.setDetailJson(JSONObject.toJSONString(imageImgStorage));
-							itemInfoVo.setName(imageImgStorage.getName());
+							itemInfoVo.setName(imageImgStorage.getName() + " (" + imageInfoRelation.getFileWidth()+ ")");
 							itemInfoVoList.add(itemInfoVo);
 							//总数量
 							number.updateAndGet(v -> v + itemInfoDto.getNumber());