오류수정

2025-10-01 09:09:55 +09:00
parent 5465556122
commit e1aa97ac24
1 changed files with 0 additions and 5 deletions
@@ -25,13 +25,8 @@ public class KjbNotRnnoJpaAttributeConverter implements AttributeConverter<Strin

        String originalAttribute = attribute;
        if (StringUtils.isNotEmpty(attribute)) {
-<<<<<<< HEAD:src/main/java/com/eactive/ext/kjb/safedb/SafeDBMNotRnnoConverter.java
-            SafeDBWrapper safeDBWrapper = SafeDBWrapper.getInstance();
-            attribute = safeDBWrapper.encryptNotRnnoString(attribute);
-=======
            KjbSafedbWrapper wrapper = KjbSafedbWrapper.getInstance();
            attribute = wrapper.encryptNotRnnoString(attribute);
->>>>>>> 24cf3d16793cadad6d3810c0d0070a8d23834a0d:src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java
        }

        log.debug("DB 암호화 #2 : {} -> {}", originalAttribute, attribute);