Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

Mono Color

• b6a2a6a8d7 feat: srm -add models 平台审批表 master TianyangZhang 2025-11-04 15:09:26 +0800
• c5110d3361 feat: srm 修改接口信息 TianyangZhang 2025-11-04 11:17:08 +0800
• adf9b95038 feat: srm 增加论文台账接口 TianyangZhang 2025-11-04 10:44:20 +0800
• b9f9527ff2 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-03 15:52:29 +0800
• 3e1f1d80eb feat: srm 修改serializer TianyangZhang 2025-11-03 15:52:28 +0800
• 4bfc0d6f20 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-11-03 14:17:23 +0800
• dd0d01c6b4 feat: 优化gen_number_with_rule的m_model的校验 caoqianming 2025-11-03 14:17:22 +0800
• 830b0392c5 feat: srm 修改 views TianyangZhang 2025-11-03 14:08:58 +0800
• 303cd94e35 feat: srm 修改models TianyangZhang 2025-11-03 13:55:41 +0800
• 9f301af038 feat: srm -views 修改patentrecord 的 搜索字段 TianyangZhang 2025-11-03 09:46:46 +0800
• e9a7d49757 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-11-03 09:43:17 +0800
• 5ea6145390 add: srm 创建新的模块 srm 科研管理 TianyangZhang 2025-11-03 09:43:16 +0800
• caf00a107a Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-31 11:09:23 +0800
• 0c25ee75f3 fix: wpr change_or_new wpr_from 配置 caoqianming 2025-10-31 11:09:22 +0800
• 80ead2f426 feat: ofm-models 修改model 字段 TianyangZhang 2025-10-30 13:56:01 +0800
• 9a4f78433f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-30 13:49:26 +0800
• 7951b98e99 feat: ofm-views 修改视图集名称 TianyangZhang 2025-10-30 13:49:25 +0800
• abcff8ae2d feat: check_wpr_number 优化 caoqianming 2025-10-29 20:27:38 +0800
• 91486f82ba add ：增加论文申密的 创建部门 TianyangZhang 2025-10-29 14:52:55 +0800
• dcc9fee8f3 fix: ofm- papersecret 修改论文申密的model 名字 TianyangZhang 2025-10-29 14:28:14 +0800
• 30bf4f5515 add: ofm 增加新的model 论文申密 TianyangZhang 2025-10-29 11:16:15 +0800
• 95037d2f49 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-28 16:56:27 +0800
• bbc1210685 feat: fix enm-models 修改 enm 字段 TianyangZhang 2025-10-28 16:56:26 +0800
• fa2edf7298 fix: wpr_bxerp 数据统计在mlogbw存在才继续 caoqianming 2025-10-28 16:55:36 +0800
• dda876092e feat: 编号生成后在提交时进行校验 caoqianming 2025-10-28 16:22:02 +0800
• 4e817d9954 fix: gen_number_with_rule bug caoqianming 2025-10-27 19:56:14 +0800
• bc0200669b feat: gen_number_with_rule 添加校验 caoqianming 2025-10-27 16:33:23 +0800
• 1ea8a30d14 feat: base clean_timescaledb_job_his 优化2 caoqianming 2025-10-24 16:33:38 +0800
• be8411245b feat: base execute_raw_sql 增加timeout参数可传none不限时 caoqianming 2025-10-24 16:33:13 +0800
• ab0a5c17fe feat: base clean_timescaledb_job_his 优化 caoqianming 2025-10-24 16:10:49 +0800
• b1fe8831cc feat: base execute_raw_sql 增加timeout参数 caoqianming 2025-10-24 16:10:37 +0800
• d4744d2602 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-24 16:00:03 +0800
• fbf36b98d8 feat: base clean_timescaledb_job_his caoqianming 2025-10-24 16:00:02 +0800
• 62f4a79ad0 feat : ofm-models 修改字段 TianyangZhang 2025-10-24 13:46:59 +0800
• 5e58eb4baf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory TianyangZhang 2025-10-24 13:45:49 +0800
• 0cdf6c68a1 feat: ofm-models 修改字段 TianyangZhang 2025-10-24 13:45:48 +0800
• 95d6dfbf6a feat: 执行数据库备份时排除指定超表 caoqianming 2025-10-24 10:46:58 +0800
• e4ce5271eb Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-24 09:45:30 +0800
• 92aa602cbe feat: backup_database 使用 sudo -u postgres caoqianming 2025-10-24 09:45:29 +0800
• 2ae7dc2635 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-22 16:10:28 +0800
• 7cd95bd1b5 feat: ofm-models 修改专利patent 字段 zty 2025-10-22 16:10:22 +0800
• 97026d86c6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-22 15:57:08 +0800
• 54999cce73 fix: mlogbw defect 分配 bug caoqianming 2025-10-22 15:57:08 +0800
• 303252e7a5 feat: ofm-models 修改专利model patentInfo 字段 zty 2025-10-22 10:12:04 +0800
• 388e225108 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-21 14:10:44 +0800
• 25ee92602b add : ofm-create-model-patent 新建专利申请 curd zty 2025-10-21 14:10:43 +0800
• 241df0beca feat: mio 添加查询条件 caoqianming 2025-10-20 16:33:46 +0800
• 5ea7980a1b feat: mloguser添加字段 caoqianming 2025-10-20 10:09:38 +0800
• a3416cfc0d feat: 修改mroombooking表约束 caoqianming 2025-10-17 14:51:13 +0800
• 2ca47b8949 feat: base 获取流转时排序按attribute_type倒序 caoqianming 2025-10-17 12:32:18 +0800
• 10792d090c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-16 16:30:15 +0800
• bfc8454ac7 feat: base workflow添加view_path2字段 caoqianming 2025-10-16 16:30:14 +0800
• 02b14ec2c6 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-16 11:18:26 +0800
• acb4c802e4 feat: ofm-services 修改绑定反存的接口 zty 2025-10-16 11:18:25 +0800
• 260c9893eb feat: base 获取流转时排序按attribute_type2 caoqianming 2025-10-16 10:55:33 +0800
• 666a9c169c Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-16 10:05:13 +0800
• b869521221 feat: base 获取流转时排序按attribute_type caoqianming 2025-10-16 10:05:12 +0800
• 99d8144bdf feat: ofm-views 修改文件列表排序 zty 2025-10-15 15:09:09 +0800
• 8a87ba356e feat: ofm-BorrowRecord - 档案借阅反存ticket-data zty 2025-10-15 14:10:33 +0800
• 830bf18132 feat: ofm-service-vehicle 用车管理反存 实际归还里程树 zty 2025-10-14 16:08:16 +0800
• b52e90a11f Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-14 14:58:11 +0800
• ee67e6896a feat: ofm-service 反向存储ticket_data 到 Lendingseal zty 2025-10-14 14:58:11 +0800
• 54f8b82c98 feat: mio增加筛选条件inout_date caoqianming 2025-10-14 14:18:27 +0800
• 6125139fbf Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-14 13:46:53 +0800
• 2169bbea68 feat: do_out和do_in在处理into_wm不应直接忽略 caoqianming 2025-10-14 13:46:53 +0800
• 6dfab46b4d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-14 10:21:52 +0800
• 477976f86c feat: ofm-views 修改时间倒叙 zty 2025-10-14 10:21:50 +0800
• c37ff77eda Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-13 15:45:04 +0800
• 1aa7d51769 feat: material添加create_time的排序条件 caoqianming 2025-10-13 15:45:04 +0800
• e06cc8c38e fix : ofm-models-publicity 修改记录编号自动生成 zty 2025-10-13 14:26:40 +0800
• b93024ca44 fix : ofm-models-publicity 修改记录编号自动生成 zty 2025-10-13 14:18:03 +0800
• 7d87c79dd1 feat: ofm-service-pulicity 反存ticket_data 到 obj zty 2025-10-13 14:04:40 +0800
• 9f030ece6d feat: ofm-service-pulicity 反存ticket_data 到 obj zty 2025-10-13 13:50:04 +0800
• 67f9cbb700 feat: ofm--Alter field publicity_opinion on publicity zty 2025-10-13 09:01:44 +0800
• 8fe2b8ca48 feat: ofm-models 修改字段属性 zty 2025-10-11 14:28:09 +0800
• 7732ddc88e Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-11 11:32:06 +0800
• 6713693c6c feat: ofm-models -pulicity 修改字段属性 zty 2025-10-11 11:32:05 +0800
• 20604ef7cb fix: work_start_time 对光子的兼容 caoqianming 2025-10-11 10:28:07 +0800
• eb2deb02c2 fix: work_start_time 可不填2 caoqianming 2025-10-11 10:22:19 +0800
• f5f6c136d9 fix: work_start_time 可不填 caoqianming 2025-10-11 10:21:22 +0800
• 8eee09678a fix: handle_date和shift可传 caoqianming 2025-10-11 10:16:13 +0800
• efd40d1d32 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-10-11 10:11:19 +0800
• 3ab9682b07 fix: work_start_time 可不填 caoqianming 2025-10-11 10:11:18 +0800
• 1983f7b121 feat: 修改 ofm-moedels - pulicity字段为空值 zty 2025-10-11 09:23:33 +0800
• cec6837d00 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-10-10 16:32:21 +0800
• e214c6115a feat: ofm-models 增加字段 zty 2025-10-10 16:32:20 +0800
• 6fb415a9f0 release: 2.8.2025101011 2.8.2025101011 caoqianming 2025-10-10 11:38:43 +0800
• 727d190610 feat: Ptest val_xj可为空 caoqianming 2025-10-10 11:12:59 +0800
• a6e0fb4f0d feat: quick调用serializer时传入request caoqianming 2025-10-09 14:44:26 +0800
• 9cf900d2ef doc: 添加一些注释 caoqianming 2025-10-09 11:17:14 +0800
• 69e8e7b025 Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory caoqianming 2025-09-30 11:05:25 +0800
• 647603f986 fix: p_create_after 自动创建mlogbw时关于exclude语句导致的查询错误 caoqianming 2025-09-30 11:05:24 +0800
• d21c1dc55d Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory zty 2025-09-30 09:58:56 +0800
• 7f206bd0a7 feat: ofm-修改model zty 2025-09-30 09:58:53 +0800
• bd763be83a feat: Mroombooking添加字段 caoqianming 2025-09-29 15:53:34 +0800
• fe499ffac5 feat: base add_info_for_item 可复用list逻辑 caoqianming 2025-09-29 15:52:54 +0800
• 0c1e93bf0b feat: 添加wpr查询参数 caoqianming 2025-09-29 14:50:02 +0800
• 5d3c4137fe feat: base cquery支持annotate caoqianming 2025-09-29 14:44:08 +0800
• dbaf121685 feat: mroombooking 返回slots caoqianming 2025-09-29 11:09:09 +0800
• fe524e389c release: 2.8.2025092816 2.8.2025092816 caoqianming 2025-09-28 16:51:44 +0800