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

2071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dj
f448ec47a3 test : 测试ci/cd 2025-06-12 15:26:52 +08:00
odjbin
f633862434 Merge pull request 'test : 测试ci/cd' (#1037) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1037
 2025-06-12 07:19:39 +00:00
dj
a4674d497b test : 测试ci/cd 2025-06-12 15:18:29 +08:00
odjbin
e8aee6f01c Merge pull request 'test : 测试ci/cd' (#1036) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1036
 2025-06-12 06:54:14 +00:00
dj
43e0f98509 test : 测试ci/cd 2025-06-12 14:53:52 +08:00
odjbin
10b66cbf15 Merge pull request 'master' (#1035) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1035
 2025-06-12 06:07:46 +00:00
dj
560bea739c test : 测试cicd 2025-06-12 14:07:25 +08:00
dj
1ed6156117 build(deps): 删除 moment 依赖 2025-06-12 12:08:41 +08:00
odjbin
4321b42003 Merge pull request 'build(deps): 添加 moment 依赖' (#1034) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1034
 2025-06-12 04:05:02 +00:00
dj
7f0f74c844 build(deps): 添加 moment 依赖 2025-06-12 12:04:11 +08:00
odjbin
c1065cb084 Merge pull request 'refactor(components): 优化文件上传成功提示' (#1033) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1033
 2025-06-12 03:42:56 +00:00
dj
579cadd687 refactor(components): 优化文件上传成功提示 2025-06-12 11:42:09 +08:00
odjbin
78f4135efb Merge pull request 'build: 调整 package.json' (#1032) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1032
 2025-06-12 03:29:12 +00:00
dj
1a120418f0 build: 调整 package.json 2025-06-12 11:28:25 +08:00
odjbin
d3ae1c1205 Merge pull request 'build: 更新 Node.js 版本并调整 package.json 格式' (#1031) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1031
 2025-06-12 03:16:06 +00:00
dj
e49b6ef1a3 build: 更新 Node.js 版本并调整 package.json 格式 2025-06-12 11:15:52 +08:00
odjbin
6fbf37ab78 Merge pull request 'fix(ProjectAttachment): 修改drone' (#1030) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1030
 2025-06-12 03:13:47 +00:00
dj
a0d9c58c77 fix(ProjectAttachment): 修改drone 2025-06-12 11:12:52 +08:00
odjbin
b3900a2a1c Merge pull request 'fix(ProjectAttachment): 修改drone' (#1029) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/1029
 2025-06-12 03:08:20 +00:00