# Conflicts: # nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java # nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
# Conflicts: # nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java # nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java