nothing代码冲突解决

YL

2021-12-23 7651c2708a69d1f1573d0542a88d91007483e522

 DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBillMain.cs

@@ -40,8 +40,10 @@
        public string HMainSourceBillType; 
        public Int64 HMainSourceInterID;
        public Int64 HMainSourceEntryID;

        public Int64 HItemMainID;
        //组织
        public Int64 HPRDORGID;
        //有效状态 
        public bool HUseFlag;
    }
}