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

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/report/SaleProfitView.java

@@ -56,4 +56,6 @@ public class SaleProfitView {
     private String pd_remark;
 
     private Double pd_profitpresent;
+
+    private Double pw_costprice;
 }

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

@@ -25,6 +25,7 @@
     <result column="pd_profitpresent" property="pd_profitpresent" jdbcType="DOUBLE" />
     <result column="companyid" property="companyid" jdbcType="INTEGER" />
       <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR" />
+    <result column="pw_costprice" property="pw_costprice" jdbcType="DOUBLE" />
   </resultMap>
   <select id="selectByCondition" resultMap="BaseResultMap">
     select  *  from Sale_Profit_View

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -115,6 +115,10 @@ Ext.define('saas.view.sale.report.SaleProfit', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '成本单价',
+        dataIndex: 'pw_costprice',
+        xtype: 'numbercolumn'
     }, {
         text: '成本金额',
         dataIndex: 'pd_total',