Merge remote-tracking branch 'origin/feature/v6.0/6.0.4' into feature/v6.0/...

张含笑

2025-09-28 b972a93d5a8c7ec03192ccd22bbd2a4f06d320ec

 src/views/system/user.vue

@@ -402,8 +402,8 @@
                  },
                  {
                    min: 2,
                    max: 10,
                    message: '姓名长度在2到5个字符',
                    max: 50,
                    message: '姓名长度在2到50个字符',
                  },
                ],
              },
@@ -515,6 +515,7 @@
            column: [
              {
                label: '到期时间',
                labelWidth: 110,
                prop: 'expireTime',
                type: 'datetime',
                format: 'YYYY-MM-DD HH:mm:ss',
@@ -522,12 +523,14 @@
              },
              {
                label: '次数限制',
                labelWidth: 110,
                prop: 'maxLoginNum',
                type: 'input',
              },

              {
                label: '飞行开始时间',
                labelWidth: 110,
                prop: 'flightStartTime',
                type: 'time',
                format: 'HH:mm',
@@ -542,6 +545,7 @@
              },
              {
                label: '飞行结束时间',
                labelWidth: 110,
                prop: 'flightEndTime',
                type: 'time',
                format: 'HH:mm',