111

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentScrapMapper.xml

@@ -21,7 +21,7 @@
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EquipmentScrapVo">
         SELECT es.*,
         e.name as equipmentName, e.code as code, e.brand as brand, e.model as model, e.purchase_date as purchaseDate,
-        e.assets_value as assetsValue, su.name as userName
+        e.assets_value as assetsValue,su.name as userName
         FROM equipment_scrap es
         left join equipment e on e.id = es.equipment_id
         left join sys_user su on su.id = es.user_id

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentScrapVo.java

@@ -47,7 +47,7 @@ public class EquipmentScrapVo {
 	private Integer userId;
 
 	@ApiModelProperty("申请人姓名")
-	private Integer userName;
+	private String userName;
 
 	@ApiModelProperty("报废原因")
 	private String scrapReason;