Merge remote-tracking branch 'origin/master'

# Conflicts:
#	platform-admin/src/main/webapp/WEB-INF/page/sys/virtualuser.html

platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml

@@ -275,7 +275,8 @@
             <if test="invitedUserId != null">`invited_user_id` = #{invitedUserId},</if>
             <if test="invitedCount != null">`invited_count` = #{invitedCount},</if>
             <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
-            <if test="emailFlag != null">`email_flag` = #{emailFlag}</if>
+            <if test="emailFlag != null">`email_flag` = #{emailFlag},</if>
+            <if test="real != null">`real` = #{real}</if>
         </set>
         where user_id = #{userId}
     </update>

platform-admin/src/main/webapp/WEB-INF/page/sys/virtualuser.html

@@ -16,9 +16,13 @@
                 <i-button @click="reloadSearch">重置</i-button>
             </div>
             <div class="buttons-group">
+
                 <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+
             </div>
         </Row>
         <div id="speedp"></div>