Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'

# Conflicts:
#   module/user/js/batchcreate.js
#   module/user/view/batchcreate.html.php
This commit is contained in:
孙广明
2022-03-10 08:07:31 +00:00
96 changed files with 1878 additions and 176 deletions
+1 -1
View File
@@ -63,7 +63,7 @@
<tr>
<th><?php echo $lang->user->visions;?></th>
<?php $visionList = $this->user->getVisionList();?>
<td><?php echo html::checkbox('visions', $visionList, key($visionList), "class='form-control'");?></td>
<td><?php echo html::checkbox('visions', $visionList, isset($visionList[$this->config->vision]) ? $this->config->vision : key($visionList), "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->realname;?></th>