Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrderCollageTeam.java

@@ -21,7 +21,7 @@
    /**
     * 活动id
     */
    private Long acctivityId;
    private Long activityId;
    /**
     * 订单id
     */
@@ -42,7 +42,14 @@
     * 创建时间
     */
    private Date createAt;


    /**
     * 状态（1.等待拼团 2.拼团成功 3.拼团失败 4.已退款）
     */
    public interface Status{
        int DDPT = 1;
        int PTCG = 2;
        int PTSB = 3;
        int YTK = 4;
    }
}