24282 8 bulan lalu
induk
melakukan
456e4ef5e5

+ 26 - 1
jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java

@@ -20,7 +20,7 @@ import java.util.Date;
  * </p>
  *
  * @author
- * @since 2024-10-16
+ * @since 2025-01-07
  */
 @Getter
 @Setter
@@ -78,6 +78,31 @@ public class CapitalTransactions extends BaseIdPo {
     private String remark;
 
     /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 是否小程序 1是 0否
+     */
+    private Integer hasApplet;
+
+    /**
+     * 是否批单 1是 0否
+     */
+    private Integer hasBulkOrder;
+
+    /**
+     * 是否私账 1私帐 0公帐
+     */
+    private Integer hasPrivate;
+
+    /**
      * 创建人
      */
     @TableField(fill = FieldFill.INSERT)

+ 25 - 0
jy-business/src/main/java/com/jy/business/capital/model/table/CapitalTransactionsTable.java

@@ -60,6 +60,31 @@ public class CapitalTransactionsTable extends Table<CapitalTransactions> {
     public QueryColumn remark = this.field(CapitalTransactions::getRemark);
 
     /**
+     * 订单id
+     */
+    public QueryColumn orderId = this.field(CapitalTransactions::getOrderId);
+
+    /**
+     * 订单编号
+     */
+    public QueryColumn orderCode = this.field(CapitalTransactions::getOrderCode);
+
+    /**
+     * 是否小程序 1是 0否
+     */
+    public QueryColumn hasApplet = this.field(CapitalTransactions::getHasApplet);
+
+    /**
+     * 是否批单 1是 0否
+     */
+    public QueryColumn hasBulkOrder = this.field(CapitalTransactions::getHasBulkOrder);
+
+    /**
+     * 是否私账 1私帐 0公帐
+     */
+    public QueryColumn hasPrivate = this.field(CapitalTransactions::getHasPrivate);
+
+    /**
      * 创建人
      */
     public QueryColumn createUser = this.field(CapitalTransactions::getCreateUser);

+ 1 - 1
jy-business/src/main/java/com/jy/business/contract/model/entity/ContractDetail.java

@@ -92,6 +92,6 @@ public class ContractDetail extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

+ 2 - 2
jy-business/src/main/java/com/jy/business/contract/model/entity/ContractInfo.java

@@ -41,7 +41,7 @@ public class ContractInfo extends BaseIdPo {
     /**
      * 客户单位地址
      */
-    private String customerCorporation Address;
+    private String customerCorporationAddress;
 
     /**
      * 客户法定代表人
@@ -112,6 +112,6 @@ public class ContractInfo extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

+ 1 - 1
jy-business/src/main/java/com/jy/business/contract/model/table/ContractInfoTable.java

@@ -32,7 +32,7 @@ public class ContractInfoTable extends Table<ContractInfo> {
     /**
      * 客户单位地址
      */
-    public QueryColumn customerCorporation Address = this.field(ContractInfo::getCustomerCorporation Address);
+    public QueryColumn customerCorporationAddress = this.field(ContractInfo::getCustomerCorporationAddress);
 
     /**
      * 客户法定代表人