Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Admin/Controllers/Recruit/RecruitController.php

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -2117,6 +2117,7 @@
 
                     axios.post("{{route('recruit.save_sign_up')}}",Qs.stringify(this.user)).then(response => {
                         if(response.data.status){
+                            console.log(response.data,response.data.is_html == 1)
                             if(response.data.is_html == 1){
                                 this.$alert(response.data.msg, '提交成功', {
                                     dangerouslyUseHTMLString: true,