增加租户界面、单据优化

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java

@@ -20,6 +20,8 @@ public class MaterialVo4Unit extends Material{
 
     private BigDecimal lowDecimal;
 
+    private BigDecimal billPrice;
+
     private String mBarCode;
 
     private String commodityUnit;
@@ -90,6 +92,14 @@ public class MaterialVo4Unit extends Material{
         this.lowDecimal = lowDecimal;
     }
 
+    public BigDecimal getBillPrice() {
+        return billPrice;
+    }
+
+    public void setBillPrice(BigDecimal billPrice) {
+        this.billPrice = billPrice;
+    }
+
     public String getmBarCode() {
         return mBarCode;
     }

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantEx.java

@@ -0,0 +1,14 @@
+package com.jsh.erp.datasource.entities;
+
+public class TenantEx extends Tenant{
+
+    private String createTimeStr;
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+}

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java

@@ -22,6 +22,10 @@ public class UserEx extends User{
 
     private String userType;
 
+    private String userNumLimit;
+
+    private String billsNumLimit;
+
     public String getOrgAbr() {
         return orgAbr;
     }
@@ -77,4 +81,20 @@ public class UserEx extends User{
     public void setUserType(String userType) {
         this.userType = userType;
     }
+
+    public String getUserNumLimit() {
+        return userNumLimit;
+    }
+
+    public void setUserNumLimit(String userNumLimit) {
+        this.userNumLimit = userNumLimit;
+    }
+
+    public String getBillsNumLimit() {
+        return billsNumLimit;
+    }
+
+    public void setBillsNumLimit(String billsNumLimit) {
+        this.billsNumLimit = billsNumLimit;
+    }
 }

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java

@@ -1,13 +1,14 @@
 package com.jsh.erp.datasource.mappers;
 
 import com.jsh.erp.datasource.entities.Tenant;
+import com.jsh.erp.datasource.entities.TenantEx;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface TenantMapperEx {
 
-    List<Tenant> selectByConditionTenant(
+    List<TenantEx> selectByConditionTenant(
             @Param("loginName") String loginName,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);