Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/ConsumerMonthlyCard.java

 package share.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -24,6 +26,7 @@ public class ConsumerMonthlyCard extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/domain/ConsumerSecondaryCard.java

 package share.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,6 +24,7 @@ public class ConsumerSecondaryCard extends BaseEntity {
     /**
      * 主键
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

share-system/src/main/java/share/system/service/impl/MonthlyCardOrderServiceImpl.java

@@ -168,6 +168,7 @@ public class MonthlyCardOrderServiceImpl extends ServiceImpl<MonthlyCardOrderMap
         consumerMonthlyCard.setExpirationDate(DateUtils.addYears(new Date(), byId.getMonthlyCardDays().intValue()));
         consumerMonthlyCard.setFreeDuration(byId.getFreeDuration());
         consumerMonthlyCard.setMonthlyCardDays(byId.getMonthlyCardDays());
+        consumerMonthlyCard.setCreateTime(new Date());
         consumerMonthlyCardService.save(consumerMonthlyCard);
     }
 

share-system/src/main/java/share/system/service/impl/SecondaryCardOrderServiceImpl.java

@@ -158,6 +158,7 @@ public class SecondaryCardOrderServiceImpl extends ServiceImpl<SecondaryCardOrde
         consumerSecondaryCard.setPackId(secondaryCardConf.getPackId());
         consumerSecondaryCard.setExpirationDate(DateUtils.addYears(new Date(), secondaryCardConf.getValidityPeriod()));
         consumerSecondaryCard.setNumber(secondaryCardConf.getNumber());
+        consumerSecondaryCard.setCreateTime(new Date());
         consumerSecondaryCardService.save(consumerSecondaryCard);
     }