Merge remote-tracking branch 'origin/master'

danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND date_format(t.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
+        group by t.user_id desc
     </select>
 
     <select id="selectTStaffById" parameterType="Long" resultMap="TStaffResult">

danger-manage-web/src/views/safetyManagement/staff/index.vue

@@ -171,7 +171,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.staffName==null">
+        <el-row >
           <el-col :span="11">
             <el-form-item label="账号" prop="userName">
               <el-input v-model="form.userName" placeholder="请输账号" />

danger-manage-web/vue.config.js

@@ -34,9 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: process.env.VUE_APP_TARGET,
-        // target: `http://192.168.2.16:8908/dangerManage`,
-        // target: `http://192.168.2.17:8908/dangerManage`,
+        //target: process.env.VUE_APP_TARGET,
+         target: `http://192.168.31.87:8908/dangerManage`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''