解决冲突

mitao

2025-03-16 ff4e5b862d7f1b56fca79b283d6afd33ade12648

解决冲突

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/annotation/TargetEnum.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.sangeshenbian.annotation;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
 * @author mitao
 * @date 2025/3/15
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface TargetEnum {
    /**
     * 控件类型
     *
     * @return
     */
    Class<? extends Enum> type();
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java

@@ -12,11 +12,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,8 +20,6 @@
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Objects;

@Api(tags = {"小程序-党员管理"})

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IPartyMemberService.java

@@ -82,5 +82,12 @@
     */
    void audit(PartyMemberDTO dto, SystemUserVo loginUserInfo);

    /**
     * 根据电话号码查询有效的党员数据
     * @param phone
     * @return
     */
    PartyMember getPartyMemberByPhone(String phone);

    Page<PendingPartyMemberApplicationVO> preAuditList(Page<PendingPartyMemberApplicationVO> page, LoginUserInfoVO loginUserInfo);
}