Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutDTO.java

@@ -84,4 +84,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
     private String pi_sellercode;
 
     private String pi_seller;
+
+    private Double pi_nettotal;
 }

applications/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -41,6 +41,7 @@
     <result column="pi_sellerid" jdbcType="INTEGER" property="pi_sellerid" />
     <result column="pi_sellercode" jdbcType="VARCHAR" property="pi_sellercode" />
     <result column="pi_seller" jdbcType="VARCHAR" property="pi_seller" />
+    <result column="pi_nettotal"  jdbcType="DOUBLE" property="pi_nettotal"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />