Merge remote-tracking branch 'origin/master_liushuang'

docs/new_sql.sql

@@ -46,3 +46,9 @@ ADD COLUMN warehousing_time DATE DEFAULT NULL COMMENT '出入库时间';
 -- 修改产品类型编码为BIGINT
 ALTER TABLE jsh_material_category MODIFY COLUMN serial_no BIGINT;
 
+
+ALTER TABLE jsh_depot_head
+    ADD COLUMN link_tesco varchar(50) DEFAULT '' COMMENT '集采订单编号',
+    ADD COLUMN receiver_name VARCHAR(255) DEFAULT '' COMMENT '收货人',
+    ADD COLUMN receiver_phone VARCHAR(20) DEFAULT '' COMMENT '收货人电话',
+    ADD COLUMN receiver_address VARCHAR(255) DEFAULT '' COMMENT '收货地址';

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -127,6 +127,19 @@ public class DepotHead {
     @ApiModelProperty("供应商名称")
     private String supplierName;
 
+    @ApiModelProperty("集采订单编号")
+    private String linkTesco;
+
+    @ApiModelProperty("收货人信息")
+    private String receiverName;
+
+    @ApiModelProperty("收货人电话")
+    private String receiverPhone;
+
+    @ApiModelProperty("收货人地址")
+    private String receiverAddress;
+
+
     public Long getId() {
         return id;
     }