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

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/report/PurchasePay.java

@@ -39,4 +39,6 @@ public class PurchasePay  extends CommonBaseEntity implements Serializable {
     private Double pi_total;
 
     private Double pi_nettotal;
+
+    private String pb_manname;
 }

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml

@@ -20,6 +20,7 @@
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="pi_nettotal" property="pi_nettotal" jdbcType="DOUBLE" />
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pb_manname" property="pb_manname" jdbcType="VARCHAR"/>
   </resultMap>
   <resultMap id="ListMap" type="com.usoftchina.saas.purchase.po.report.PurchaseReportDetail">
     <id column="pu_id" property="pu_id" jdbcType="INTEGER" />