Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java

@@ -1,6 +1,7 @@
 package com.czg.order.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
@@ -136,6 +137,7 @@ public class ShopOrderStatistic implements Serializable {
     /**
      * 新增会员数
      */
+    @Column(ignore = true)
     private Long newMemberCount = 0L;
     /**
      * 店铺id