Merge branch 'pre' into 'master'

Pre

See merge request !52

docu/20210927_member_voucher_refund.sql

@@ -261,6 +261,8 @@ create table candy_coupon_code
 
     redeem_start  datetime(3) comment '兑换开放时间',
     redeem_stop   datetime(3) comment '兑换停止时间',
+
+    operator      varchar(64) comment '操作人',
     created_at    datetime(3) not null,
     updated_at    datetime(3),
 
@@ -286,6 +288,7 @@ create table candy_user_coupon
     used_at    datetime(3) comment '使用时间',
     used_for   varchar(255) comment '用于记录购买的内容',
 
+    operator      varchar(64) comment '操作人',
     created_at    datetime(3) not null,
     updated_at    datetime(3),
 

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCouponCode.java

@@ -69,6 +69,11 @@ public class CandyCouponCode implements Serializable {
      */
     private LocalDateTime redeemStop;
 
+    /**
+     * 操作人
+     */
+    private String operator;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyUserCoupon.java

@@ -73,6 +73,11 @@ public class CandyUserCoupon implements Serializable,Cloneable {
      */
     private String usedFor;
 
+    /**
+     * 操作人
+     */
+    private String operator;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -97,6 +97,8 @@ create table candy_coupon_code
 
     redeem_start  datetime(3) comment '兑换开放时间',
     redeem_stop   datetime(3) comment '兑换停止时间',
+
+    operator      varchar(64) comment '操作人',
     created_at    datetime(3) not null,
     updated_at    datetime(3),
 
@@ -122,6 +124,7 @@ create table candy_user_coupon
     used_at    datetime(3) comment '使用时间',
     used_for   varchar(255) comment '用于记录购买的内容',
 
+    operator      varchar(64) comment '操作人',
     created_at    datetime(3) not null,
     updated_at    datetime(3),