# Conflicts: # zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/tools/WxLoginUserUtil.java
# Conflicts: # gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AccountInfo.java