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

5 years ago · 9361512fb8
parent b1dddb62d3 28498cdf8a
commit 9361512fb8
1 changed files with 3 additions and 0 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@ -72,6 +72,9 @@ public class MesCellFeed extends BaseBean implements Serializable {
    @ApiParam("工单号")
    private String orderNo;

+    @Transient
+    @ApiParam(value = "原料类型名称")
+    private String rawTypeName;

    public double getRawQtyVal() {
        return this.rawQty == null ? 0l : this.rawQty;