# Conflicts: # lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java # lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java # lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml
zhousq