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

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/CustomerCheckView.java

@@ -41,13 +41,29 @@ public class CustomerCheckView {
 
     private String pr_orispeccode;
 
-    public String getPr_brand(){return pr_brand;}
+    private Double pd_ordertotal;
 
-    public void setPr_brand(String pr_brand){ this.pr_brand = pr_brand;}
+    public Double getPd_ordertotal(){
+        return pd_ordertotal;
+    }
+    public void setPd_ordertotal(Double pd_ordertotal){
+        this.pd_ordertotal = pd_ordertotal;
+    }
+    public String getPr_brand(){
+        return pr_brand;
+    }
 
-    public String getPr_orispeccode(){return pr_orispeccode;}
+    public void setPr_brand(String pr_brand){
+        this.pr_brand = pr_brand;
+    }
 
-    public void setPr_orispeccode(String pr_orispeccode){ this.pr_orispeccode = pr_orispeccode;}
+    public String getPr_orispeccode(){
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode){
+        this.pr_orispeccode = pr_orispeccode;
+    }
 
     public Long getCompanyId() {
         return companyId;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAcountView.java

@@ -40,7 +40,14 @@ public class VendorAcountView {
     private Integer companyId;
     private String pd_remark;
     private int ym;
+    private Double pd_ordertotal;
 
+    public Double getPd_ordertotal(){
+        return pd_ordertotal;
+    }
+    public void setPd_ordertotal(Double pd_ordertotal){
+        this.pd_ordertotal = pd_ordertotal;
+    }
     public String getPr_orispeccode() {
         return pr_orispeccode;
     }

applications/money/money-server/src/main/resources/mapper/CustomerCheckViewMapper.xml

@@ -14,6 +14,7 @@
         <result column="pd_unit" property="pd_unit" jdbcType="VARCHAR" />
         <result column="qty" property="qty" jdbcType="DOUBLE" />
         <result column="pd_orderprice" property="pd_orderprice" jdbcType="DOUBLE" />
+        <result column="pd_ordertotal" property="pd_ordertotal" jdbcType="DOUBLE" />
         <result column="pd_taxrate" property="pd_taxrate" jdbcType="DOUBLE" />
         <result column="pd_total" property="pd_total" jdbcType="DOUBLE" />
         <result column="pd_netprice" property="pd_netprice" jdbcType="DOUBLE" />

applications/money/money-server/src/main/resources/mapper/VendorAcountViewMapper.xml

@@ -16,6 +16,7 @@
     <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
     <result column="qty" property="qty" jdbcType="DOUBLE" />
     <result column="pd_orderprice" property="pd_orderprice" jdbcType="DOUBLE" />
+    <result column="pd_ordertotal" property="pd_ordertotal" jdbcType="DOUBLE" />
     <result column="pd_taxrate" property="pd_taxrate" jdbcType="DOUBLE" />
     <result column="pd_total" property="pd_total" jdbcType="DOUBLE" />
     <result column="pd_netprice" property="pd_netprice" jdbcType="DOUBLE" />