解决合并冲突

chenhaozhe

2025-05-26 29bf38f64c14321cf435e897c396111e92ab03a7

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -39,9 +39,9 @@
        public long HUnitGroupID;
        public long HMaterTypeID;
        public double HPlanPrice;
        public int HUSEORGID;
        //public int HUSEORGID;
        public int HERPItemID;
        public int HCREATEORGID;
       // public int HCREATEORGID;
        public int HPlanMode;
        public int HBatchManager;
        public string HOldMaterNumber;