◐ Shell
clean mode source ↗

Develop by niefy · Pull Request #1659 · binarywang/WxJava

Skip to content

Navigation Menu

Sign in

Appearance settings

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up

Appearance settings

Merged

binarywang

merged 5 commits into

binarywang:developfrom

niefy:develop

Jul 6, 2020

Merged

Develop#1659

binarywang

merged 5 commits into

binarywang:developfrom

niefy:develop

Conversation

@niefy

@niefy niefy commented

Jul 6, 2020

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

@binarywang

Copy link Copy Markdown

Owner

冲突需要先解决下

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

niefy commented

Jul 6, 2020

Copy link Copy Markdown

Author

已解决代码冲突

@binarywang binarywang merged commit 0adca96 into binarywang:develop

Jul 6, 2020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@niefy @binarywang