Merge remote-tracking branch 'origin/master'

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java

@@ -85,6 +85,14 @@ public class PmsPurchaseBill extends BaseEntity {
     private String payTypeKey;
     @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
     private String payTypeValue;
+
+    @ApiModelProperty("厂家订单类型key")
+    private String manufacturersOrderTypeKey;
+    @ApiModelProperty("厂家订单类型value")
+    private String manufacturersOrderTypeValue;
+    @ApiModelProperty("厂家订单号")
+    private String manufacturersOrderNumber;
+
     @ApiModelProperty("误差调整金额")
     private BigDecimal errorAmount;