Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopUser.java

@@ -1,18 +1,3 @@
-/*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
 package cn.ysk.cashier.pojo.shop;
 
 import lombok.Data;
@@ -23,7 +8,7 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
-import java.util.Date;
+import java.sql.Timestamp;
 
 /**
 * @website https://eladmin.vip
@@ -154,6 +139,9 @@ public class TbShopUser implements Serializable {
     @Column(name = "`dynamic_code`")
     private String dynamicCode;
 
+    @Column(name = "`join_time`")
+    private Timestamp joinTime;
+
 
     public void copy(TbShopUser source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));