Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 d698714e61e1b322ef12d65a52089ceff8a63703

 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;
    }
}