Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mapper/OrderInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.logpm.factorydata.suofeiya.mapper.OrderInfoMapper">
 
     <select id="findNotFullOrder" resultType="com.logpm.factorydata.suofeiya.entity.OrderInfoEntity">
-        select distinct main_order_no,order_type,tenant_code
+        select distinct main_order_no,ifnull(order_type,'') order_type,tenant_code
         from sfy_order_info
         where order_full = 'N'
     </select>