Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-27 e95b39d335a224617621de3fd5d645fd2f47338f

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