odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,090 Commits 11 Branches 0 Tags
ea33ffb60a7dc9812159906ac45d187b5f1c2970
Commit Graph

2090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
ea33ffb60a Merge pull request 'test : ci/cd' (#1062) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1062
 2025-06-14 08:31:16 +00:00
dj
a1ae39cbd7 test : ci/cd 2025-06-14 16:31:03 +08:00
odjbin
0ada78f180 Merge pull request 'test : ci/cd' (#1061) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1061
 2025-06-14 08:29:25 +00:00
dj
60e29aca8d test : ci/cd 2025-06-14 16:29:03 +08:00
odjbin
3db2901a03 Merge pull request 'test : ci/cd' (#1060) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1060
 2025-06-14 08:25:50 +00:00
dj
7428fe43d4 test : ci/cd 2025-06-14 16:25:38 +08:00
odjbin
18592571a4 Merge pull request 'test : ci/cd' (#1059) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1059
 2025-06-14 07:44:49 +00:00
dj
4bb03409f4 test : ci/cd 2025-06-14 15:42:17 +08:00
odjbin
7fec9c5735 Merge pull request 'test : ci/cd 2' (#1058) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1058
 2025-06-14 07:26:53 +00:00
dj
3d9f22d503 test : ci/cd 2 2025-06-14 15:26:40 +08:00
odjbin
76c9a38718 Merge pull request 'test : ci/cd1' (#1057) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1057
 2025-06-14 07:21:25 +00:00
dj
af7d0ac580 test : ci/cd1 2025-06-14 15:21:14 +08:00
odjbin
4888a7e077 Merge pull request 'test : ci/cd' (#1056) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1056
 2025-06-14 07:18:38 +00:00
dj
47a2f61036 test : ci/cd 2025-06-14 15:18:22 +08:00
odjbin
f26e40df90 Merge pull request 'master' (#1055) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1055
 2025-06-14 07:13:11 +00:00
dj
07103258f7 test : ci/cd 2025-06-14 15:12:49 +08:00
dj
8fa0d72cc4 test : ci/cd 2025-06-14 15:09:17 +08:00
odjbin
7684444e93 Merge pull request 'test : ci/cd' (#1054) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1054
 2025-06-14 07:05:25 +00:00
dj
81446971e5 test : ci/cd 2025-06-14 15:04:38 +08:00
odjbin
5930a2c4b6 Merge pull request 'test : ci/cd' (#1053) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1053
 2025-06-14 06:57:14 +00:00
dj
052c0090e3 test : ci/cd 2025-06-14 14:56:46 +08:00
odjbin
d24892141a Merge pull request 'test : ci/cd' (#1052) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1052
 2025-06-14 06:43:28 +00:00
dj
83dc28630b test : ci/cd 2025-06-14 14:43:10 +08:00
odjbin
086fdb36e9 Merge pull request 'test : ci/cd' (#1051) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1051
 2025-06-14 06:35:32 +00:00
dj
ba4c4fccdd test : ci/cd 2025-06-14 14:35:18 +08:00
odjbin
bc79cfc0bc Merge pull request 'test : ci/cd' (#1050) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1050
 2025-06-14 06:17:25 +00:00
dj
35d4d1b7ba test : ci/cd 2025-06-14 14:17:14 +08:00
odjbin
71324efd0c Merge pull request 'test : 测试ci/cd-5' (#1049) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1049
 2025-06-13 10:23:30 +00:00
dj
781e7393e8 test : 测试ci/cd-5 2025-06-13 18:22:50 +08:00
odjbin
1eea7a377c Merge pull request 'test : 测试ci/cd-4' (#1048) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1048
 2025-06-13 10:17:23 +00:00
dj
065eb6cfba test : 测试ci/cd-4 2025-06-13 18:17:01 +08:00
odjbin
35a2f755a2 Merge pull request 'test : 测试ci/cd-3' (#1047) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1047
 2025-06-13 10:10:41 +00:00
dj
9bd9cda872 test : 测试ci/cd-3 2025-06-13 18:10:24 +08:00
odjbin
dd6181880a Merge pull request 'test : 测试ci/cd-2' (#1046) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1046
 2025-06-13 09:59:51 +00:00
dj
cd2bfe8817 test : 测试ci/cd-2 2025-06-13 17:59:33 +08:00
odjbin
8b6406c4e0 Merge pull request 'test : 测试ci/cd-1' (#1045) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1045
 2025-06-13 09:50:39 +00:00
dj
fa3171fecd test : 测试ci/cd-1 2025-06-13 17:50:21 +08:00
odjbin
177ccee058 Merge pull request 'test : 测试ci/cd' (#1044) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1044
 2025-06-13 06:57:28 +00:00
dj
28de3667f5 test : 测试ci/cd 2025-06-13 14:57:15 +08:00
odjbin
05a5385d87 Merge pull request 'test : 测试ci/cd' (#1043) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1043
 2025-06-13 06:39:59 +00:00
dj
529f482bc7 test : 测试ci/cd 2025-06-13 14:39:23 +08:00
odjbin
20fb592584 Merge pull request 'test : 测试ci/cd' (#1042) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1042
 2025-06-13 06:23:55 +00:00
dj
bd35243cbd test : 测试ci/cd 2025-06-13 14:23:37 +08:00
odjbin
d7ca84a4a0 Merge pull request 'master' (#1041) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1041
 2025-06-13 06:19:11 +00:00
odjbin
6c7eddcf94 Merge pull request 'test : 测试ci/cd' (#1040) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1040
 2025-06-13 06:18:59 +00:00
odjbin
3588257f61 revert 215f7c6bbf 
revert feat(expense-management): 添加研发工时超过21.75天的提示功能

- 在保存分配明细时，增加对研发人员总工时的计算
- 如果总工时超过21.75天，系统将发出警告通知- 优化了控制台日志输出，便于调试和监控
 2025-06-13 06:18:21 +00:00
odjbin
6c47337318 Merge pull request 'revert 215f7c6bbf084b0bf6dbee1303a2539a3c21c3ad' (#1039) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1039
 2025-06-13 06:14:59 +00:00
odjbin
bacd397294 revert 215f7c6bbf 
revert feat(expense-management): 添加研发工时超过21.75天的提示功能

- 在保存分配明细时，增加对研发人员总工时的计算
- 如果总工时超过21.75天，系统将发出警告通知- 优化了控制台日志输出，便于调试和监控
 2025-06-13 06:14:19 +00:00
dj
b3dbb24bb2 test : 测试ci/cd 2025-06-13 14:11:25 +08:00
odjbin
9e194f5f04 Merge pull request 'test : 测试ci/cd' (#1038) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1038
 2025-06-12 07:29:49 +00:00