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

1801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
0cb840a466 Merge pull request 'dj' (#867) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/867
 2024-10-25 02:48:06 +00:00
odjbin
b8aa24e6a0 fix : 修复tinymce的多图片上传和附件上传 2024-10-25 10:46:53 +08:00
odjbin
e3b17f0f04 fix : 修复tinymce的多图片上传和附件上传 2024-10-25 10:46:35 +08:00
odjbin
a1b249b86c Merge pull request 'master' (#866) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/866
 2024-10-24 15:04:46 +00:00
odjbin
d12d4865c7 Merge pull request 'feat : 项目基本信息加上是否在预算内字段' (#865) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/865
 2024-10-24 15:04:37 +00:00
odjbin
a01cede9c0 feat : 项目基本信息加上是否在预算内字段 2024-10-24 23:01:54 +08:00
odjbin
318410ff74 Merge pull request 'feat : 需求上报和详情新增是否在预算内字段' (#864) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/864
 2024-10-24 14:04:59 +00:00
odjbin
a8feed2d7f feat : 需求上报和详情新增是否在预算内字段 2024-10-24 22:04:46 +08:00
odjbin
fe0a6bb3be Merge pull request 'master' (#863) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/863
 2024-10-24 05:13:45 +00:00
odjbin
872c54abd3 Merge pull request 'fix : 修复前置流程弹窗的提示,首页需求上报跳转位置' (#862) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/862
 2024-10-24 05:13:34 +00:00
odjbin
c2c1cfd6e1 fix : 修复前置流程弹窗的提示,首页需求上报跳转位置 2024-10-24 13:13:11 +08:00
odjbin
41bd6d1686 Merge pull request 'master' (#861) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/861
 2024-10-24 02:29:18 +00:00
odjbin
779d6f7094 Merge pull request 'fix : 按钮放在右上角浮动' (#860) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/860
 2024-10-24 02:29:06 +00:00
odjbin
5c4f25dc1a fix : 按钮放在右上角浮动 2024-10-24 10:28:53 +08:00
odjbin
e65bf98db2 Merge pull request 'master' (#859) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/859
 2024-10-23 15:15:36 +00:00
odjbin
c17396d44a Merge pull request 'fix : 按钮放在右上角浮动' (#858) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/858
 2024-10-23 15:15:15 +00:00
odjbin
344a3a03b3 fix : 按钮放在右上角浮动 2024-10-23 23:14:56 +08:00
odjbin
dc8fc056f9 Merge pull request 'master' (#857) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/857
 2024-10-23 14:56:37 +00:00
odjbin
9ff596c167 Merge pull request 'fix : 修复年docx文件预览框溢出bug' (#856) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/856
 2024-10-23 14:56:28 +00:00
odjbin
a82030b04f fix : 修复年docx文件预览框溢出bug 2024-10-23 22:53:46 +08:00
odjbin
d316661574 Merge pull request 'master' (#855) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/855
 2024-10-23 14:32:41 +00:00
odjbin
3690235ae7 Merge pull request 'fix : 修复年度计划项目详情跳转' (#854) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/854
 2024-10-23 14:32:32 +00:00
odjbin
2a788fff0a fix : 修复年度计划项目详情跳转 2024-10-23 22:32:10 +08:00
odjbin
a3b93d0e1a Merge pull request 'master' (#853) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/853
 2024-10-23 13:58:17 +00:00
odjbin
3d6bdd50ca Merge pull request 'fix : 修复文章详情排版' (#852) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/852
 2024-10-23 13:58:08 +00:00
odjbin
20b2203930 fix : 修复文章详情排版 2024-10-23 21:56:18 +08:00
odjbin
d23a86e9ea Merge pull request 'master' (#851) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/851
 2024-10-23 13:38:31 +00:00
odjbin
6afc855cd8 Merge pull request 'feat : 费用管理中新增项目台账' (#850) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/850
 2024-10-23 13:38:06 +00:00
odjbin
44a50176cc feat : 费用管理中新增项目台账 2024-10-23 21:37:17 +08:00
odjbin
069816e17f Merge pull request 'dj' (#849) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/849
 2024-10-22 15:20:03 +00:00
odjbin
57ec7832f2 fix : 修复文件预览弹窗适配 2024-10-22 23:19:44 +08:00
odjbin
dfdaabeb48 fix : 修复新增研发投入资金bug 2024-10-20 21:17:45 +08:00
odjbin
f427fa9ef2 Merge pull request 'master' (#848) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/848
 2024-10-17 14:49:45 +00:00
odjbin
bfc6845071 Merge pull request 'fix : 清空登录默认账号' (#847) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/847
 2024-10-17 14:48:53 +00:00
odjbin
ea9047ee2a fix : 清空登录默认账号 2024-10-17 22:47:27 +08:00
odjbin
87ab014111 Merge pull request 'master' (#846) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/846
 2024-10-17 14:36:15 +00:00
odjbin
1341f3749b Merge pull request 'fix : 修复首页时间提示' (#845) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/845
 2024-10-17 14:36:05 +00:00
odjbin
30f3f3bdcd fix : 修复首页时间提示 2024-10-17 22:35:54 +08:00
odjbin
f9d7b765d1 Merge pull request 'master' (#844) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/844
 2024-10-17 14:25:57 +00:00
odjbin
fbb277cb30 Merge pull request 'fix : 修复非超级管理员的名称搜索问题' (#843) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/843
 2024-10-17 14:25:45 +00:00
odjbin
145bb01fdd fix : 修复非超级管理员的名称搜索问题 2024-10-17 22:25:31 +08:00
odjbin
7601a7872c Merge pull request 'master' (#842) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/842
 2024-10-14 06:49:01 +00:00
odjbin
f36c8ffcac Merge pull request 'fix : 清空登录默认账号' (#841) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/841
 2024-10-14 06:36:01 +00:00
odjbin
de0b64909d fix : 清空登录默认账号 2024-10-14 14:35:43 +08:00
odjbin
39af97815c Merge pull request 'master' (#840) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/840
 2024-10-14 04:17:33 +00:00
odjbin
bcffdba692 Merge pull request 'fix : 修改首页提示' (#839) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/839
 2024-10-14 04:17:25 +00:00
odjbin
2e9d015623 fix : 修改首页提示 2024-10-14 12:16:57 +08:00
odjbin
4654f71f11 Merge pull request 'master' (#838) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/838
 2024-10-13 16:28:06 +00:00
odjbin
9d63e05d03 Merge pull request 'fix : 修改首页提示' (#837) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/837
 2024-10-13 16:27:46 +00:00
odjbin
6ea9538b0a fix : 修改首页提示 2024-10-14 00:27:15 +08:00