新增type数据结构照片字段

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java

@@ -75,6 +75,7 @@ public class EquipmentSizeDto {
     private Integer state;
 
     private String photo;
+    private String typePhoto;
 
     private String instructions;
 

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java

@@ -127,6 +127,8 @@ public class EquipmentType implements Serializable {
     @ApiModelProperty(value = "单价")
     private BigDecimal price;
 
+    private String photo;
+
 
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -218,7 +218,7 @@ public class InventorySummary implements Serializable {
     private Integer property;
 
     @TableField(exist = false)
-    private String picture;
+    private String sizePhoto;
 
 
     private static final long serialVersionUID = 1L;

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -121,7 +121,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         for (InventorySummary is:records) {
             for (EquipmentSize size:equipmentSizeList) {
                 if (is.getSizeId().equals(size.getId())&& is.getTypeId().equals(size.getTypeId())){
-                    is.setPicture(size.getPhoto());
+                    is.setSizePhoto(size.getPhoto());
                     break;
                 }
             }

jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml

@@ -12,6 +12,8 @@
       t2.name AS eqName,
       t1.name AS name,
       t1.type_id AS typeId,
+      t1.photo as photo,
+      t2.photo as typePhoto,
       t2.price AS price,
       t1.code AS code,
       t3.name AS type3Name,
@@ -48,6 +50,8 @@
       eqName,
       name,
       typeId,
+      photo,
+      typePhoto,
       price,
       code,
       type3Name,