finished task for wirecraft by Jiang Feng Ji#19

jiangfengji wants to merge 2 commits into

Wiredcraft:masterWiredcraft/test-backend-java:masterfrom

jiangfengji:masterjiangfengji/test-backend-java:masterCopy head branch name to clipboard