Merge branch 'aship/aship#1' into 'master'

aship/aship#1 防伪码功能:供应商启用防伪码功能字段

See merge request !1

src/main/java/com/i1/srm/base/dao/entity/BaseSupplierFile.java

@@ -163,6 +163,7 @@ public class BaseSupplierFile extends IdentifiableObject {
     private String stopReason;
     private String uploadErp;
     private String uploadErpResult;
+    private String useBarcode;
 
 
     public BaseCurrencyFile getTelCurrency() {
@@ -1215,4 +1216,14 @@ public class BaseSupplierFile extends IdentifiableObject {
     public void setUploadErpResult(String uploadErpResult) {
         this.uploadErpResult = uploadErpResult;
     }
+
+    @Basic
+    @Column(name = "USE_BARCODE")
+    public String getUseBarcode() {
+        return useBarcode;
+    }
+
+    public void setUseBarcode(String useBarcode) {
+        this.useBarcode = useBarcode;
+    }
 }

upgrade/sql/mysql/V2017.180__ALTER_TABLE_BASE_SUPPLIER_FILE.sql

+ALTER TABLE srm_base_supplier_file ADD USE_BARCODE varchar(1) COMMENT'是否使用防伪码';
\ No newline at end of file