代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

1
2
3
4
5
6
7
8
9
10
11
12
13
14
package com.panzhihua.common.model.helper.encrypt;
 
import java.lang.annotation.*;
 
/**
 * 加密字段注解
 */
@Documented
@Inherited
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface EncryptDecryptField {
 
}