Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 0655da5ce12155f0e02fc548d697a6124d03b85b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActActivityCodeApi.java

@@ -9,7 +9,7 @@
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.schedule.util.QRCodeUtil;
import com.panzhihua.service_community.util.QRCodeUtil;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;