Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

 src/main/java/com/ruoyi/production/dto/ProductProcessDto.java

@@ -13,8 +13,4 @@
@ApiModel
public class ProductProcessDto extends ProductProcess {

    @ApiModelProperty("设备名称")
    @Excel(name = "设备名称")
    private String deviceName;

}