Merge branch 'dev' into 'master'

代码辅助生成

See merge request !4
1 job for master in 18 seconds (queued for 11 seconds)
Status Job ID Name Coverage
  Deploy Pre
failed #5257
xdyj-pre manual
deploy-pre

00:00:18

 
Name Stage Failure
failed
deploy-pre Deploy Pre
==== go build mac ok ====
xdtool
==== tar linux ok ====
xdtool
==== tar mac ok ====
$ sh /home/gitlab-runner/deploy_xdtool.sh
==== new version already exists! deploy failed ====
Cleaning up file based variables
ERROR: Job failed: exit status 1