更改文字“帐号”改为“账号”

2 months ago · 8a4a5721ff
14 changed files with 16 additions and 16 deletions
--- a/renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/TbStockResultDTO.java
+++ b/renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/TbStockResultDTO.java
@ -84,7 +84,7 @@ public class TbStockResultDTO implements Serializable {
 	@ApiModelProperty(value = "股东代码")
 	private String shareholderCode;

-	@ApiModelProperty(value = "资金帐号")
+	@ApiModelProperty(value = "资金账号")
 	private String capitalAccount;

 	@ApiModelProperty(value = "备注")
--- a/renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/TbTransDetailDTO.java
+++ b/renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/TbTransDetailDTO.java
@ -102,7 +102,7 @@ public class TbTransDetailDTO implements Serializable {
 	@ApiModelProperty(value = "股东代码")
 	private String shareholderCode;

-	@ApiModelProperty(value = "资金帐号")
+	@ApiModelProperty(value = "资金账号")
 	private String capitalAccount;

 	@ApiModelProperty(value = "币种")
--- a/renren-admin/renren-admin-server/src/main/java/io/renren/stock/entity/TbStockResultEntity.java
+++ b/renren-admin/renren-admin-server/src/main/java/io/renren/stock/entity/TbStockResultEntity.java
@ -102,7 +102,7 @@ public class TbStockResultEntity {
     */
 	private String shareholderCode;
    /**
-     * 资金帐号
+     * 资金账号
     */
 	private String capitalAccount;
    /**
--- a/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbStockReportExcel.java
+++ b/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbStockReportExcel.java
@ -63,7 +63,7 @@ public class TbStockReportExcel {
    private Float totalCharge;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "备注")
    private String remark;
--- a/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbStockResultExcel.java
+++ b/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbStockResultExcel.java
@ -63,7 +63,7 @@ public class TbStockResultExcel {
    private Float totalCharge;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "备注")
    private String remark;
--- a/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbTransDetailExcel.java
+++ b/renren-admin/renren-admin-server/src/main/java/io/renren/stock/excel/TbTransDetailExcel.java
@ -72,7 +72,7 @@ public class TbTransDetailExcel {
    private String serialNumber;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "币种")
    private String currency;
--- a/renren-module/stock/stock-client/src/main/java/io/renren/dto/TbStockResultDTO.java
+++ b/renren-module/stock/stock-client/src/main/java/io/renren/dto/TbStockResultDTO.java
@ -84,7 +84,7 @@ public class TbStockResultDTO implements Serializable {
 	@ApiModelProperty(value = "股东代码")
 	private String shareholderCode;

-	@ApiModelProperty(value = "资金帐号")
+	@ApiModelProperty(value = "资金账号")
 	private String capitalAccount;

 	@ApiModelProperty(value = "备注")
--- a/renren-module/stock/stock-client/src/main/java/io/renren/dto/TbTransDetailDTO.java
+++ b/renren-module/stock/stock-client/src/main/java/io/renren/dto/TbTransDetailDTO.java
@ -103,7 +103,7 @@ public class TbTransDetailDTO implements Serializable {
 	@ApiModelProperty(value = "股东代码")
 	private String shareholderCode;

-	@ApiModelProperty(value = "资金帐号")
+	@ApiModelProperty(value = "资金账号")
 	private String capitalAccount;

 	@ApiModelProperty(value = "币种")
--- a/renren-module/stock/stock-server/src/main/java/io/renren/entity/TbStockResultEntity.java
+++ b/renren-module/stock/stock-server/src/main/java/io/renren/entity/TbStockResultEntity.java
@ -102,7 +102,7 @@ public class TbStockResultEntity {
     */
 	private String shareholderCode;
    /**
-     * 资金帐号
+     * 资金账号
     */
 	private String capitalAccount;
    /**
--- a/renren-module/stock/stock-server/src/main/java/io/renren/entity/TbTransDetailEntity.java
+++ b/renren-module/stock/stock-server/src/main/java/io/renren/entity/TbTransDetailEntity.java
@ -147,9 +147,9 @@ public class TbTransDetailEntity{
 	@ExcelProperty("股东代码")
 	private String shareholderCode;
 	/**
-	 * 资金帐号
+	 * 资金账号
 	 */
-	@ExcelProperty("资金帐号")
+	@ExcelProperty("资金账号")
 	private String capitalAccount;
 	/**
 	 * 币种
--- a/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbStockReportExcel.java
+++ b/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbStockReportExcel.java
@ -63,7 +63,7 @@ public class TbStockReportExcel {
    private Float totalCharge;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "备注")
    private String remark;
--- a/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbStockResultExcel.java
+++ b/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbStockResultExcel.java
@ -64,7 +64,7 @@ public class TbStockResultExcel {
    private Float totalCharge;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "备注")
    private String remark;
--- a/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbTransDetailExcel.java
+++ b/renren-module/stock/stock-server/src/main/java/io/renren/excel/TbTransDetailExcel.java
@ -74,7 +74,7 @@ public class TbTransDetailExcel {
    private String serialNumber;
    @Excel(name = "股东代码")
    private String shareholderCode;
-    @Excel(name = "资金帐号")
+    @Excel(name = "资金账号")
    private String capitalAccount;
    @Excel(name = "币种")
    private String currency;
--- a/renren_cloud.sql
+++ b/renren_cloud.sql
@ -72,7 +72,7 @@ CREATE TABLE `tb_stock_trans`  (
  `profit_loss_percent` float(10, 2) NOT NULL COMMENT '盈利/亏损百分比',
  `total_charge` float(10, 2) NOT NULL COMMENT '总费用',
  `shareholder_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '股东代码',
-  `capital_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '资金帐号',
+  `capital_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '资金账号',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  PRIMARY KEY (`stock_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
@ -114,7 +114,7 @@ CREATE TABLE `tb_trans_detail`  (
  `entrusting_serial` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '委托编号',
  `serial_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '流水号',
  `shareholder_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '股东代码',
-  `capital_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资金帐号',
+  `capital_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资金账号',
  `currency` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '币种',
  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  `gather_flag` smallint(11) NULL DEFAULT NULL COMMENT '汇总标识：0，未汇总，1，已汇总',