Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-business-qinghai into dev

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpInboundMapper.xml

@@ -20,6 +20,7 @@
     <resultMap id="BaseResultMap2" extends="BaseResultMap" type="com.chinaitop.depot.rp.model.BusinessRpInbound">
         <result column="grainVarietyName" property="grainVarietyName" />
         <result column="grainNatureName" property="grainNatureName" />
+        <result column="orgName" property="orgName" />
     </resultMap>
 
     <sql id="Example_Where_Clause" >

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpOutboundMapper.xml

@@ -45,11 +45,14 @@
     <resultMap id="BaseResultMap2" extends="BaseResultMap" type="com.chinaitop.depot.rp.model.BusinessRpOutbound">
 
         <result column="basicStorehouseName" property="basicStorehouseName" />
+        <result column="storehouseName" property="storehouseName" />
         <result column="grainVarietyName" property="grainVarietyName" />
         <result column="grainNatureName" property="grainNatureName" />
         <result column="grainGradeName" property="grainGradeName" />
         <result column="warehouseName" property="warehouseName" />
         <result column="remarks" property="remarks" jdbcType="LONGVARCHAR" />
+        <result column="orgName" property="orgName" />
+
 
     </resultMap>
     <resultMap id="ResultMapWithBLOBs" type="com.chinaitop.depot.rp.model.BusinessRpOutbound" extends="BaseResultMap" >
@@ -623,7 +626,8 @@
     d.inspection_report_id,
     d.regular_inspection_report_ids,
     d.plan_quantity,
-        o.org_name orgName,
+    o.org_name as "orgName",
+    st.storehouse_name as "basicStorehouseName",
     st.storehouse_name as "storehouseName",
     wa.warehouse_name  as "warehouseName",
     pz.enumname as "grainVarietyName",

src/main/java/com/chinaitop/depot/rp/model/BusinessRpInbound.java

@@ -71,4 +71,6 @@ public class BusinessRpInbound implements Serializable {
     @ApiModelProperty(value = "粮食性质；basic_enum的id；粮食性质名称")
     private String grainNatureName;
 
+    private String orgName;
+
 }

src/main/java/com/chinaitop/depot/rp/model/BusinessRpOutbound.java

@@ -105,4 +105,7 @@ public class BusinessRpOutbound implements Serializable {
 
     @ApiModelProperty(value = "粮食等级；basic_enum的id；粮食等级名称")
     private String grainGradeName;
+
+    private String orgName;
+    private String storehouseName;
 }