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

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/Purchase.java

@@ -120,13 +120,4 @@ public class Purchase extends BasePo {
      * 采购单个数
      */
     private Integer count;
-
-    /**
-     * 业务来源 0自建  1外销合同采购 2:样品单
-     */
-    private Integer dataResource;
-    /**
-     * 业务来源id
-     */
-    private Long dataResourceId;
 }