# Conflicts:
#	community-service/src/main/java/com/tanpu/community/service/TopicService.java

0214 visitlog fix

See merge request !42

visit log fix

See merge request !37

topic锁

See merge request !35

redis锁fix

See merge request !32

Bugfix 1208

See merge request !31

This reverts commit bfc118e2