bug修改-04

unis-plugin/unis-plugin-biz/src/main/java/com/unis/grainReserves/modular/reserveQuantity/mapper/mapping/ReserveQuantityMapper.xml

@@ -107,12 +107,9 @@
             data_kcgl_kcsw_default kkd
         LEFT JOIN basic_storehouse bs ON kkd.UnitID = bs.org_id
         AND kkd.ch = bs.storehouse_id
-<<<<<<< HEAD
         LEFT JOIN basic_warehouse bw ON bs.org_id = bw.org_id AND kkd.hwh = bw.warehouse_id
-=======
         LEFT JOIN basic_warehouse bw ON bs.org_id = bw.org_id
         AND bs.house = bw.warehouse_id AND kkd.hwh = bw.warehouse_id
->>>>>>> dev
         LEFT JOIN basic_enum be ON be.enumId = kkd.pz
         LEFT JOIN basic_enum be1 ON be1.enumId = kkd.hwxz
         LEFT JOIN basic_enum be2 ON be2.enumId = kkd.dj