Master See merge request !1
# Conflicts: # attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/RedisKey.java