Commit Graph

1670 Commits

Author SHA1 Message Date
ec8b2fd847 feat(REQ-3982) - trigger compiler 2025-05-07 14:30:12 +08:00
e7a9238a43 Merge branch 'feature/REQ-3982' 2025-05-07 14:20:21 +08:00
2b27402b7f feat(REQ-3982) - 调整价款审批附件传参 2025-05-06 17:38:25 +08:00
a5f97f4640 feat(REQ-3982) - 调整日志 null 字符串的问题 2025-04-30 16:04:17 +08:00
582c6875bc feat(REQ-3982) - 调整创建业务表单可能出现的事务问题 2025-04-30 10:43:06 +08:00
yanglin
2fe47895c5 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-29 19:59:40 +08:00
yanglin
419e64e807 REQ-3982: fix bugs 2025-04-29 19:59:38 +08:00
a831e18877 feat(REQ-3982) - 移除审批发起人节点的通过事件和日志记录 2025-04-29 18:33:30 +08:00
yanglin
d64c3b8c61 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-29 18:11:27 +08:00
yanglin
296737e253 REQ-3982: fix bugs 2025-04-29 18:11:23 +08:00
f53a6bfcd8 feat(REQ-3982) - 移除审批发起人节点的通过事件和日志记录 2025-04-29 18:02:59 +08:00
034857010f feat(REQ-3982) - 调整价款审批发待办传参 2025-04-29 17:50:31 +08:00
yanglin
fe1665b755 REQ-3982: fix bugs 2025-04-29 17:47:30 +08:00
yanglin
b9d315f4f3 REQ-3982: fix bugs 2025-04-29 17:20:41 +08:00
yanglin
9dec6904ef REQ-3982: fix bugs 2025-04-29 16:24:05 +08:00
yanglin
9fb4a349d6 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-29 15:34:21 +08:00
yanglin
9f1bccabb2 REQ-3982: fix bugs 2025-04-29 15:34:17 +08:00
479c302522 feat(REQ-3982) - 调整价款审批的单据校验 2025-04-28 20:23:07 +08:00
80ed816c81 feat(REQ-3982) - 调整价款审批的单据校验 2025-04-28 20:20:56 +08:00
2609467cc7 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-28 18:31:01 +08:00
b19032e3d4 feat(REQ-3982) - 调整价款审批的单据校验 2025-04-28 18:30:50 +08:00
徐大伟
65d879acb4 Merge branch 'feature/REQ-3540' into 'master'
Feature/req 3540

See merge request universal/infrastructure/backend/nanopart!158
2025-04-28 09:00:20 +00:00
xudawei
5039cd9375 Merge branch 'master' into feature/REQ-3540 2025-04-28 16:56:40 +08:00
yanglin
a1950b0261 REQ-3982: fix bugs 2025-04-28 14:38:43 +08:00
yanglin
ba087086b3 REQ-3982: fix bugs 2025-04-28 11:47:05 +08:00
徐大伟
65970b5107 Merge branch 'feature/REQ-3846' into 'master'
Feature/req 3846

See merge request universal/infrastructure/backend/nanopart!156
2025-04-28 02:44:00 +00:00
xudawei
c33deb72eb Merge branch 'master' into feature/REQ-3846
# Conflicts:
#	doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/anonymous/DocAnonymousDatabaseApi.java
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/dao/IndexNodeDao.java
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/anonymous/DocAnonymousDatabaseApiController.java
2025-04-28 10:41:54 +08:00
yanglin
f3bcfa6f20 REQ-3982: fix bugs 2025-04-28 10:38:44 +08:00
yanglin
fa0913b715 REQ-3982: fix bugs 2025-04-28 10:24:16 +08:00
yanglin
d589427248 REQ-3982: fix bugs 2025-04-27 18:27:27 +08:00
yanglin
6530b22249 REQ-3982: fix bugs 2025-04-27 18:13:26 +08:00
yanglin
654dc4cc7f REQ-3982: fix bugs 2025-04-27 17:39:36 +08:00
chenwenjian
6ff0129ada Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-27 15:32:11 +08:00
chenwenjian
d3782ea849 feat(REQ-3982): 分页筛查立项通过时间调整 2025-04-27 15:32:02 +08:00
yanglin
c23b01e156 REQ-3982: fix bugs 2025-04-27 15:29:58 +08:00
yanglin
679a0c3bdc Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-27 15:19:21 +08:00
yanglin
9d0a9f0feb REQ-3982: fix bugs 2025-04-27 15:19:18 +08:00
chenwenjian
51097263bd feat(REQ-3982): 注释调整 2025-04-27 15:14:36 +08:00
yanglin
af5840bcfc REQ-3982: fix bugs 2025-04-27 14:42:50 +08:00
yanglin
973586bef3 REQ-3982: 卡片返回流程阶段 2025-04-27 13:54:04 +08:00
yanglin
abe93578ec REQ-3982: 卡片返回流程阶段 2025-04-27 13:49:32 +08:00
f7bacb2833 feat(REQ-3982) - 添加日志 2025-04-25 17:35:57 +08:00
6b4598480a feat(REQ-3982) - 调整审批过程同意的日志记录逻辑 2025-04-25 17:14:54 +08:00
yanglin
f160271d71 REQ-3982: fix bugs 2025-04-25 16:46:44 +08:00
yanglin
cb144203ba REQ-3982: fix bugs 2025-04-25 16:44:54 +08:00
yanglin
163f40ca09 REQ-3982: fix bugs 2025-04-25 16:44:32 +08:00
yanglin
95c76d1075 Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982 2025-04-25 16:41:42 +08:00
yanglin
39f886a179 REQ-3982: fix bugs 2025-04-25 16:41:39 +08:00
e8d332c13e feat(REQ-3982) - 调整价款审批提交表单内容 2025-04-25 16:03:09 +08:00
yanglin
0092fbdaa9 REQ-3982: 没有打印模版时去掉相关的按钮 2025-04-25 15:59:19 +08:00