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

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

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

@@ -110,5 +110,14 @@
        int YXJ = 2;
        int YJS = 3;
    }

    /**
     * 活动类型（1.拼团活动 2.砍价活动 3.限时秒杀）
     */
    public interface Type{
        int PT = 1;
        int KJ = 2;
        int MS = 3;
    }
}