c85b3de
(release)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-08-01 10:25:41 +0800
5d154d4
(refs/pull/133/head, develop)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-08-01 10:25:20 +0800
ee80e8f
(refs/pull/132/head, zhangtao)
add status signout by
2023-08-01 10:24:13 +0800
c31d64e
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-07-06 11:07:19 +0800
fed59b8
(refs/pull/131/head)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-07-06 11:06:57 +0800
77810c8
(refs/pull/130/head)
4180 by
2023-07-06 10:42:55 +0800
484e584
(HEAD -> master)
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2023-06-29 16:39:45 +0800
62cc1c6
(refs/pull/129/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-05-22 16:30:02 +0800
398b8d1
(refs/pull/128/head)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-05-22 16:29:38 +0800
5f94754
(refs/pull/127/head)
add equipment by
2023-05-22 16:28:57 +0800
ee5043b
Merge branch 'master' of gitadmin/tuoheng_pilot_web into develop by
2023-05-09 08:56:14 +0800
0c0e19c
(refs/pull/126/head)
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master by
2023-05-05 17:07:47 +0800
cc18952
(refs/pull/125/head, hotfix)
add hnlcpath by
2023-05-05 17:07:15 +0800
c840be8
add hnlcpath by
2023-05-05 17:06:26 +0800
639c2ea
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master by
2023-05-05 16:07:25 +0800
d36190f
(refs/pull/124/head)
add transferpage by
2023-05-05 16:06:26 +0800
99eef9b
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2023-04-13 15:01:42 +0800
5205ce2
(refs/pull/123/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-13 14:29:00 +0800
8dcebd6
(refs/pull/122/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-13 14:13:18 +0800
a120867
(refs/pull/121/head, yufei)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-13 14:11:45 +0800
89bdc9c
删除操作按钮用户type判断 by
2023-04-13 14:10:37 +0800
f275bfa
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-13 11:53:08 +0800
921d441
(refs/pull/120/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-13 11:49:44 +0800
7a4ff33
(refs/pull/119/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-13 11:48:57 +0800
4308e9a
登录去除admin校验 by
2023-04-13 11:48:42 +0800
c5ecd04
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-13 11:45:40 +0800
7bd4c4c
(refs/pull/118/head, refs/pull/117/head)
合并 by
2023-04-13 11:42:39 +0800
352e0c2
获取用户信息之后再跳转 by
2023-04-13 11:41:09 +0800
75221cc
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2023-04-13 09:41:06 +0800
5f77360
(refs/pull/114/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-13 09:40:58 +0800
e516eaf
(refs/pull/116/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into develop by
2023-04-13 09:38:40 +0800
5894534
merge by
2023-04-13 09:38:25 +0800
3c0710c
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-10 11:49:17 +0800
d6ce60b
(refs/pull/113/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-10 11:33:35 +0800
61a7b6f
(refs/pull/112/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-10 11:18:26 +0800
88f8729
3791 by
2023-04-10 11:18:09 +0800
0790862
3785 by
2023-04-10 11:17:57 +0800
676c46b
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-10 10:38:11 +0800
a394a93
(refs/pull/111/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-10 10:37:25 +0800
d53f3d9
(refs/pull/110/head)
新建用户增加用户类型选择 by
2023-04-10 10:36:42 +0800
84d6a0b
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-10 09:30:36 +0800
62f767c
修改用户状态接口 by
2023-04-10 09:30:20 +0800
e32b0af
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 14:38:05 +0800
80c93bb
(refs/pull/109/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 14:36:35 +0800
5b6b4e5
(refs/pull/108/head)
合并 by
2023-04-07 14:30:25 +0800
2677e70
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 14:28:23 +0800
51787c0
(refs/pull/107/head)
change version by
2023-04-07 14:28:13 +0800
c86bc2f
刷新获取用户信息 by
2023-04-07 14:28:04 +0800
15da955
change auth by
2023-04-07 14:26:29 +0800
e8d9803
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 14:08:37 +0800
e13cfd7
(refs/pull/106/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 14:06:47 +0800
b1683ef
(refs/pull/105/head)
修改 by
2023-04-07 14:05:25 +0800
2aa26d4
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 13:32:47 +0800
11c6f73
(refs/pull/104/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 13:32:11 +0800
d26a42d
(refs/pull/103/head)
分配权限 by
2023-04-07 13:31:49 +0800
f4dc4f6
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 11:40:09 +0800
0c8f620
(refs/pull/102/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 11:33:14 +0800
77bea6e
(refs/pull/101/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-07 11:32:24 +0800
8201e08
登录后获取用户信息 by
2023-04-07 11:32:14 +0800
09854cd
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 10:59:08 +0800
f5c76b4
(refs/pull/100/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 10:58:11 +0800
162f26d
(refs/pull/99/head)
修改任务模块按钮显示逻辑 by
2023-04-07 10:55:44 +0800
b2ac9cf
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 10:48:15 +0800
4b032aa
(refs/pull/98/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 10:47:52 +0800
2a32445
(refs/pull/97/head)
修改小程序查询传参 by
2023-04-07 10:47:22 +0800
abb66ca
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 10:27:41 +0800
21db107
(refs/pull/96/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 10:27:09 +0800
190ee21
(refs/pull/95/head)
删除冗余代码 by
2023-04-07 10:26:32 +0800
d769b71
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 10:21:41 +0800
6be49ee
(refs/pull/94/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 10:21:20 +0800
3d1b5a4
(refs/pull/93/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei by
2023-04-07 10:20:05 +0800
0c45b5a
设备管理模块新增按钮权限 by
2023-04-07 10:19:58 +0800
421afaa
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-04-07 08:49:38 +0800
93d560b
(refs/pull/92/head)
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop by
2023-04-07 08:49:02 +0800
59a98cd
(refs/pull/91/head)
新增菜单管理、角色管理、小程序菜单管理等模块、修改人员管理不分逻辑 by
2023-04-07 08:47:25 +0800
0065113
合并 by
2023-04-06 09:06:57 +0800
a566524
对接菜单权限 by
2023-04-06 09:04:32 +0800
379ca18
(refs/pull/115/head)
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2023-03-30 19:14:41 +0800
d8f2d0a
(refs/pull/90/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-03-30 16:05:16 +0800
902f5dd
(refs/pull/89/head)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-03-30 16:05:06 +0800
eb55820
(refs/pull/88/head)
change srt_type by
2023-03-30 16:04:34 +0800
e94d555
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-03-27 09:02:02 +0800
f861861
(refs/pull/87/head)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-03-27 09:00:55 +0800
f070117
(refs/pull/86/head)
add srt_type by
2023-03-27 08:59:34 +0800
412a223
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master by
2023-02-16 10:15:35 +0800
5f96995
(refs/pull/85/head)
3546 by
2023-02-16 10:14:58 +0800
e38ccc5
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop by
2023-01-31 11:34:22 +0800
05842e9
(refs/pull/84/head, wudi)
上传进度条 by
2023-01-31 11:31:56 +0800
b81c05a
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2023-01-14 09:38:56 +0800
77f87c1
(refs/pull/83/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2023-01-12 10:41:06 +0800
58c2ee5
(refs/pull/82/head)
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop by
2023-01-06 16:55:26 +0800
9fee125
(refs/pull/81/head)
是否直播 by
2023-01-06 16:53:05 +0800
d1ccedc
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2023-01-04 14:30:12 +0800
ccab0c7
(refs/pull/80/head)
change table siwtch by
2023-01-04 14:28:43 +0800
7c0ed5a
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2022-12-22 11:49:22 +0800
c5e9495
(refs/pull/79/head)
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop by
2022-12-21 17:28:12 +0800
ba620b6
(refs/pull/78/head)
sdk报错 by
2022-12-21 17:22:15 +0800
4419817
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master by
2022-12-13 22:11:27 +0800
fb7f775
(refs/pull/77/head)
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release by
2022-12-13 21:57:35 +0800
0387e1f
(refs/pull/76/head)
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop by
2022-12-13 21:57:24 +0800