Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1659

Merged
merged 5 commits into from
Jul 6, 2020
Merged

Develop #1659

merged 5 commits into from
Jul 6, 2020

Conversation

niefy
Copy link

@niefy niefy commented Jul 6, 2020

  1. 解决动态添加第一个公众号时由于configStorageMap为null报空指针异常
  2. Json解析统一优化
  3. 代码整理 - 移除无用import

@binarywang
Copy link
Member

冲突需要先解决下

niefy added 2 commits July 6, 2020 16:22
# Conflicts:
#	weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java
#	weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java
@niefy
Copy link
Author

niefy commented Jul 6, 2020

已解决代码冲突

@binarywang binarywang merged commit 0adca96 into Wechat-Group:develop Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants