 ljmwkx
|
7ed5450aa8
|
按钮 默认隐藏
|
2025-01-18 17:47:23 +08:00 |
|
|
ljmwkx
|
54934fd080
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2025-01-18 17:10:52 +08:00 |
|
|
ljmwkx
|
ae15d52057
|
主题 升级改造
|
2025-01-18 17:09:20 +08:00 |
|
|
ljm
|
47d6a4ac01
|
!1381 11
Merge pull request !1381 from ljm/dev_ljm_20241129
|
2025-01-17 08:22:06 +00:00 |
|
|
ljmwkx
|
fac6762245
|
流程修改
|
2025-01-17 16:19:23 +08:00 |
|
|
ljm
|
d43ff6f70c
|
!1375 1
Merge pull request !1375 from ljm/dev_ljm_20241129
|
2025-01-16 12:54:08 +00:00 |
|
|
ljmwkx
|
1113ff93fe
|
1
|
2025-01-16 20:52:53 +08:00 |
|
|
ljm
|
78ecac4d80
|
!1247 1
Merge pull request !1247 from dev_ljm_20241129
|
2025-01-09 08:41:23 +00:00 |
|
|
ljmwkx
|
cebc628beb
|
1
|
2025-01-09 16:40:03 +08:00 |
|
|
ljmwkx
|
674567b9de
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2025-01-09 16:37:56 +08:00 |
|
|
ljmwkx
|
106e40dc7c
|
暂时测试
|
2025-01-09 16:37:39 +08:00 |
|
|
ljm
|
56592c983b
|
!1245 1
Merge pull request !1245 from ljm/dev_ljm_20241129
|
2025-01-09 07:46:55 +00:00 |
|
|
ljmwkx
|
ecf2297f5a
|
暂时测试
|
2025-01-09 15:45:01 +08:00 |
|
|
ljm
|
0e0b29ca27
|
!1240 1
Merge pull request !1240 from ljm/dev_ljm_20241129
|
2025-01-09 07:15:51 +00:00 |
|
|
ljm
|
1e6fba9bc6
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_ljm_20241129
Signed-off-by: ljm <1340053001@qq.com>
|
2025-01-09 07:15:08 +00:00 |
|
|
ljmwkx
|
6120c621cb
|
暂时测试
|
2025-01-09 15:13:07 +08:00 |
|
|
ljm
|
2b28f3a97a
|
!1236 1
Merge pull request !1236 from dev_ljm_20241129
|
2025-01-09 06:55:28 +00:00 |
|
|
ljmwkx
|
9ed7625024
|
暂时测试
|
2025-01-09 14:51:40 +08:00 |
|
|
ljm
|
6a788cb0e5
|
!1231 1
Merge pull request !1231 from dev_ljm_20241129
|
2025-01-09 03:24:42 +00:00 |
|
|
ljmwkx
|
ec35844f5b
|
暂时测试
|
2025-01-09 11:24:05 +08:00 |
|
|
ljm
|
286bb177f3
|
!1226 1
Merge pull request !1226 from dev_ljm_20241129
|
2025-01-09 02:49:05 +00:00 |
|
|
ljmwkx
|
a59fe42cd3
|
暂时测试
|
2025-01-09 10:48:24 +08:00 |
|
|
ljm
|
ab304fc564
|
!1224 1
Merge pull request !1224 from dev_ljm_20241129
|
2025-01-09 02:42:00 +00:00 |
|
|
ljmwkx
|
4b4c85bb58
|
暂时测试
|
2025-01-09 10:38:36 +08:00 |
|
|
ljm
|
c7ef5f406d
|
!1214 1
Merge pull request !1214 from dev_ljm_20241129
|
2025-01-08 16:03:52 +00:00 |
|
|
ljm
|
e034c70979
|
!1213 1
Merge pull request !1213 from dev_ljm_20241129
|
2025-01-08 16:03:31 +00:00 |
|
|
ljmwkx
|
6149f7dba2
|
暂时测试
|
2025-01-09 00:03:18 +08:00 |
|
|
ljmwkx
|
2f3520ff82
|
暂时测试
|
2025-01-09 00:00:55 +08:00 |
|
|
ljmwkx
|
c26ff5ed5b
|
暂时测试
|
2025-01-09 00:00:00 +08:00 |
|
|
ljm
|
176a8b2061
|
!1212 1
Merge pull request !1212 from dev_ljm_20241129
|
2025-01-08 15:55:04 +00:00 |
|
|
ljmwkx
|
9c10f1493c
|
暂时测试
|
2025-01-08 23:53:39 +08:00 |
|
|
ljm
|
2fd4d551b7
|
!1202 1
Merge pull request !1202 from dev_ljm_20241129
|
2025-01-08 09:50:22 +00:00 |
|
|
ljmwkx
|
53cd84f4b5
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2025-01-08 17:49:54 +08:00 |
|
|
ljmwkx
|
0ec0f81257
|
1
|
2025-01-08 17:49:21 +08:00 |
|
|
ljm
|
64c1095868
|
!1199 1
Merge pull request !1199 from dev_ljm_20241129
|
2025-01-08 09:37:21 +00:00 |
|
|
ljmwkx
|
f1c86d8748
|
1
|
2025-01-08 17:35:35 +08:00 |
|
|
ljm
|
ebca252ccc
|
!1195 1
Merge pull request !1195 from dev_ljm_20241129
|
2025-01-08 08:05:33 +00:00 |
|
|
ljmwkx
|
4ff81dd4fd
|
1
|
2025-01-08 16:04:07 +08:00 |
|
|
ljm
|
01aaf3596e
|
!1193 1
Merge pull request !1193 from dev_ljm_20241129
|
2025-01-08 07:30:08 +00:00 |
|
|
ljmwkx
|
912181316e
|
1
|
2025-01-08 15:28:57 +08:00 |
|
|
ljm
|
2723f494ec
|
!1181 1
Merge pull request !1181 from dev_ljm_20241129
|
2025-01-07 13:15:52 +00:00 |
|
|
ljmwkx
|
b2b60399e3
|
1
|
2025-01-07 21:14:57 +08:00 |
|
|
ljm
|
b249a79cf4
|
!1180 1
Merge pull request !1180 from dev_ljm_20241129
|
2025-01-07 12:45:29 +00:00 |
|
|
ljmwkx
|
e9561af9bb
|
1
|
2025-01-07 20:44:21 +08:00 |
|
|
ljm
|
d68632286e
|
!1176 1
Merge pull request !1176 from dev_ljm_20241129
|
2025-01-07 09:09:41 +00:00 |
|
|
ljmwkx
|
f52438b0e8
|
1
|
2025-01-07 17:07:10 +08:00 |
|
|
ljm
|
3edf2305fa
|
!1166 1
Merge pull request !1166 from dev_ljm_20241129
|
2025-01-06 13:03:45 +00:00 |
|
|
ljmwkx
|
44388afd8b
|
1
|
2025-01-06 21:03:22 +08:00 |
|
|
ljm
|
a0c6b71b5f
|
!1165 1
Merge pull request !1165 from dev_ljm_20241129
|
2025-01-06 13:02:07 +00:00 |
|
|
ljmwkx
|
b68bb22f1a
|
1
|
2025-01-06 21:01:40 +08:00 |
|
|
ljm
|
62d3a2676f
|
!1164 1
Merge pull request !1164 from dev_ljm_20241129
|
2025-01-06 12:58:19 +00:00 |
|
|
ljmwkx
|
8de7790856
|
1
|
2025-01-06 20:57:39 +08:00 |
|
|
ljm
|
18edcd69d0
|
!1155 1
Merge pull request !1155 from dev_ljm_20241129
|
2025-01-06 10:56:43 +00:00 |
|
|
ljmwkx
|
7d7471a8cc
|
1
|
2025-01-06 18:56:03 +08:00 |
|
|
ljm
|
d682dd6617
|
!1149 1
Merge pull request !1149 from dev_ljm_20241129
|
2025-01-06 08:47:32 +00:00 |
|
|
ljmwkx
|
a4b1277052
|
1
|
2025-01-06 16:44:10 +08:00 |
|
|
ljmwkx
|
010b9ad35e
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2025-01-06 15:41:23 +08:00 |
|
|
ljm
|
0ef128ebb8
|
!1135 1
Merge pull request !1135 from dev_ljm_20241129
|
2025-01-05 13:45:19 +00:00 |
|
|
ljmwkx
|
5a9fb6d923
|
1
|
2025-01-05 21:44:42 +08:00 |
|
|
ljm
|
b1101f9bb7
|
!1134 1
Merge pull request !1134 from dev_ljm_20241129
|
2025-01-05 13:35:54 +00:00 |
|
|
ljmwkx
|
e68a5ee650
|
1
|
2025-01-05 21:34:41 +08:00 |
|
|
ljm
|
d9ecb1ce88
|
!1132 模板 需要什么加什么
Merge pull request !1132 from dev_ljm_20241129
|
2025-01-05 07:02:44 +00:00 |
|
|
ljmwkx
|
b6ee61d410
|
模板 需要什么加什么
|
2025-01-05 15:00:49 +08:00 |
|
|
ljm
|
74dc37f258
|
!1125 1
Merge pull request !1125 from dev_ljm_20241129
|
2025-01-04 10:43:45 +00:00 |
|
|
ljmwkx
|
18d5d97394
|
暂时提交一版
|
2025-01-04 18:42:30 +08:00 |
|
|
ljm
|
0b2e2d1f36
|
!1114 1
Merge pull request !1114 from dev_ljm_20241129
|
2025-01-04 04:34:38 +00:00 |
|
|
ljmwkx
|
ae11e8d4de
|
暂时提交一版
|
2025-01-04 12:33:59 +08:00 |
|
|
ljm
|
bafb50e540
|
!1113 1
Merge pull request !1113 from dev_ljm_20241129
|
2025-01-04 04:24:44 +00:00 |
|
|
ljmwkx
|
42f5341916
|
增加公休判断，暂未测试
|
2025-01-04 12:23:09 +08:00 |
|
|
ljm
|
0c24d15090
|
!1072 1
Merge pull request !1072 from dev_ljm_20241129
|
2025-01-02 13:27:41 +00:00 |
|
|
ljmwkx
|
f60e1f9c4a
|
打卡时间需要判断上班和下班
|
2025-01-02 21:22:11 +08:00 |
|
|
ljm
|
09b30ca85e
|
!1022 1
Merge pull request !1022 from dev_ljm_20241129
|
2024-12-31 09:17:50 +00:00 |
|
|
ljmwkx
|
68c239ea44
|
行政班次也使用区间， 请先测试
|
2024-12-31 17:16:58 +08:00 |
|
|
ljm
|
9d655025ca
|
!1018 1
Merge pull request !1018 from dev_ljm_20241129
|
2024-12-31 05:55:46 +00:00 |
|
|
ljmwkx
|
b2bcf8f96d
|
1
|
2024-12-31 13:43:04 +08:00 |
|
|
ljm
|
0f8c8b80c0
|
!1014 1
Merge pull request !1014 from dev_ljm_20241129
|
2024-12-30 13:20:08 +00:00 |
|
|
ljmwkx
|
a1d61a41b5
|
1
|
2024-12-30 21:19:01 +08:00 |
|
|
ljmwkx
|
0ebe43d295
|
1
|
2024-12-30 17:36:39 +08:00 |
|
|
ljm
|
9a6be9f823
|
!1010 1
Merge pull request !1010 from dev_ljm_20241129
|
2024-12-30 08:48:01 +00:00 |
|
|
ljmwkx
|
ce7dd29fc4
|
1
|
2024-12-30 16:46:53 +08:00 |
|
|
ljm
|
e8e4d0c962
|
!997 1
Merge pull request !997 from dev_ljm_20241129
|
2024-12-29 12:23:08 +00:00 |
|
|
ljmwkx
|
b6e99ff96f
|
时间超过24点
|
2024-12-29 20:22:02 +08:00 |
|
|
ljmwkx
|
4d9b59e958
|
第几年开始
|
2024-12-29 20:10:53 +08:00 |
|
|
ljm
|
bb6e45f64d
|
!995 1
Merge pull request !995 from dev_ljm_20241129
|
2024-12-29 09:45:21 +00:00 |
|
|
ljmwkx
|
5fcf98cad4
|
改成 float
|
2024-12-29 17:44:07 +08:00 |
|
|
ljm
|
f3306961e8
|
!948 权限
Merge pull request !948 from dev_ljm_20241129
|
2024-12-26 12:55:26 +00:00 |
|
|
ljmwkx
|
152d59849e
|
权限管理
|
2024-12-26 20:52:34 +08:00 |
|
|
ljmwkx
|
0dc64432e9
|
Merge branch 'dev_ljm_20241129' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2024-12-26 19:23:41 +08:00 |
|
|
ljmwkx
|
02c463bd52
|
创建权限组
|
2024-12-26 19:21:26 +08:00 |
|
|
ljm
|
4c6a1e12e6
|
!917 1
Merge pull request !917 from dev_ljm_20241129
|
2024-12-25 03:12:37 +00:00 |
|
|
ljmwkx
|
fea69c815e
|
还原
|
2024-12-25 11:09:48 +08:00 |
|
|
ljm
|
803795c147
|
!915 梳理
Merge pull request !915 from dev_ljm_20241129
|
2024-12-25 02:08:30 +00:00 |
|
|
ljmwkx
|
0314b20a57
|
梳理
|
2024-12-25 10:07:24 +08:00 |
|
|
ljm
|
9ba785acc2
|
!910 1
Merge pull request !910 from dev_ljm_20241129
|
2024-12-24 13:33:32 +00:00 |
|
|
ljmwkx
|
04595c1037
|
值班的考勤数据
|
2024-12-24 21:32:19 +08:00 |
|
|
ljm
|
6e208290cf
|
!909 1
Merge pull request !909 from dev_ljm_20241129
|
2024-12-24 12:51:01 +00:00 |
|
|
ljmwkx
|
ec56aead5c
|
值班的考勤数据
|
2024-12-24 20:49:44 +08:00 |
|
|
ljm
|
7bce15a2da
|
!891 1
Merge pull request !891 from dev_ljm_20241129
|
2024-12-24 07:08:39 +00:00 |
|
|
ljmwkx
|
ec67474c3c
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129
|
2024-12-24 15:06:44 +08:00 |
|
|
ljmwkx
|
b5f59971d5
|
1
|
2024-12-24 15:05:56 +08:00 |
|