Merge branch 'dev' of depot-qinghai/depot-business-qinghai into master

src/main/java/com/chinaitop/depot/grainReserves/mapper/BizGopsPlanMapper.xml

@@ -46,7 +46,7 @@
         LEFT JOIN basic_warehouse bw ON gps.warehouse_id = bw.warehouse_id
         LEFT JOIN basic_enum be ON be.enumId = gps.grain_variety_id
         LEFT JOIN basic_enum be1 ON be1.enumId = gps.grain_nature_id
-        LEFT JOIN basic_enum be2 ON be1.enumId = gps.grain_grade_id
+        LEFT JOIN basic_enum be2 ON be2.enumId = gps.grain_grade_id
         WHERE
             gps.gops_plan_id = #{id}
     </select>