Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts:
#	klp-admin/src/main/resources/application.yml

klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="owner" column="owner"/>
         <result property="quantity" column="quantity"/>
         <result property="unit" column="unit"/>
+        <result property="annex" column="annex"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>

klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockVo">
         SELECT
             s.*,
+            w.warehouse_name,
             CASE
                 WHEN s.item_type = 'product' THEN p.product_name
                 WHEN s.item_type = 'raw_material' THEN r.raw_material_name
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wms_stock s
         LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
         LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
+        left join wms_warehouse w on s.warehouse_id = w.warehouse_id
         ${ew.customSqlSegment}
     </select>