Commit Graph

1464 Commits

Author SHA1 Message Date
yanglin
c93c787b6a REQ-3540: rename 2025-03-17 14:04:15 +08:00
yanglin
f8758960c0 REQ-3540: rename 2025-03-17 13:56:26 +08:00
yanglin
e3503757f4 REQ-3540: rename 2025-03-17 12:29:11 +08:00
yanglin
ba8af14a16 REQ-3540: rename 2025-03-17 11:28:19 +08:00
yanglin
2879472470 REQ-3540: rename 2025-03-17 11:07:54 +08:00
yanglin
492a4051b0 REQ-3540: rename 2025-03-17 11:05:36 +08:00
yanglin
0ea89ecd4d REQ-3540: rename 2025-03-17 11:04:30 +08:00
yanglin
6b2b133233 REQ-3540: 备份 2025-03-17 10:59:08 +08:00
yanglin
afd28bb689 REQ-3540: 备份 2025-03-17 10:44:09 +08:00
yanglin
91747f3eea REQ-3540: 备份 2025-03-17 10:43:35 +08:00
yanglin
7cbb6fd549 REQ-3540: 备份 2025-03-17 09:50:18 +08:00
yanglin
b895d07497 REQ-3540: 编译报错问题 2025-03-17 09:31:14 +08:00
yanglin
b5794cb3fc REQ-3540: 备份 2025-03-17 09:30:00 +08:00
yanglin
d48841e2c7 REQ-3540: 备份 2025-03-17 09:28:50 +08:00
yanglin
03a24f5f28 REQ-3540: 备份 2025-03-17 09:27:57 +08:00
yanglin
3cd2ab97fb Merge branch 'feature/REQ-3540' of axzsource.com:universal/infrastructure/backend/nanopart into feature/REQ-3540
# Conflicts:
#	doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/wps/request/WpsUsersRequest.java
#	doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/wps/response/WpsEditUploadCompleteResponse.java
2025-03-17 09:26:09 +08:00
yanglin
059312756a REQ-3540: 备份 2025-03-17 09:24:31 +08:00
xudawei
4accf9eca2 feat: (REQ-3540) wps获取用户集合List改成Set 2025-03-14 16:50:14 +08:00
xudawei
3b0d9c6aa7 feat: (REQ-3540) fix-complier-error 2025-03-14 16:11:55 +08:00
e05dc34ff6 feat(REQ-3581) - 调整通知模板参数 2025-03-13 18:40:44 +08:00
7e9a50acaf feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:54:41 +08:00
xudawei
1903d07e55 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540
# Conflicts:
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsbase/WpsBaseManager.java
2025-03-13 17:52:19 +08:00
xudawei
c759f5bfb2 feat: (REQ-3540) wps对接-编辑实现 2025-03-13 17:51:45 +08:00
41bb353ae5 feat(REQ-3581) - 完善腾讯撤销合同的逻辑 2025-03-13 17:44:31 +08:00
cd3db49e9c feat(REQ-3581) - 补充用印申请待办的消息变量 2025-03-13 17:41:06 +08:00
ee5849c1b1 feat(REQ-3581) - 添加变洽签单据通知事件 code 默认值 2025-03-13 17:32:01 +08:00
yanglin
5fe7465120 REQ-3540: 换endpoint试试一些场景 2025-03-13 16:57:18 +08:00
yanglin
78473e8a8e REQ-3540: 换endpoint试试一些场景 2025-03-13 16:36:04 +08:00
yanglin
7f8b7b45ab Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-13 16:02:10 +08:00
yanglin
5a0d047a80 REQ-3540: 换endpoint试试一些场景 2025-03-13 16:02:07 +08:00
d5041605de feat(REQ-3581) - 审批结束后发送自定义通知 2025-03-13 16:01:54 +08:00
1490e166f7 Merge remote-tracking branch 'origin/master' into feature/REQ-3581
# Conflicts:
#	visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/WorkflowGateway.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java
#	visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
2025-03-13 15:42:17 +08:00
yanglin
c1b559134f REQ-3540: 解决报错问题 2025-03-13 15:36:02 +08:00
yanglin
1996c2ebf3 REQ-3540: 避免报错 2025-03-13 14:14:23 +08:00
yanglin
a4cc104cb0 REQ-3540: 备份 2025-03-13 14:10:04 +08:00
yanglin
4a915078a7 REQ-3540: 设置AutoJumpBack 2025-03-13 14:07:05 +08:00
yanglin
deebc5066b Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581 2025-03-13 13:38:25 +08:00
yanglin
5ca4ea2846 REQ-3540: 添加印章管理人员的时候,如果人员已经认证了, 就直接授权 2025-03-13 13:38:21 +08:00
xudawei
9ba3caf8d3 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540
# Conflicts:
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsbase/WpsBaseController.java
#	doc/doc-server/src/main/java/cn/axzo/nanopart/doc/wps/wpsedit/WpsEditController.java
2025-03-12 20:51:35 +08:00
xudawei
08fa7ccd75 feat: (REQ-3540) wps对接-manager实现 2025-03-12 20:50:25 +08:00
ca82d1f905 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 17:03:01 +08:00
5c4e99b061 feat(REQ-3798) - 调整班组类型协同关系登录人的审批人获取逻辑 2025-03-12 16:41:36 +08:00
54afee381e feat(REQ-3581) - 调整如何没传图片,不再向流程转发 2025-03-12 16:35:45 +08:00
d4ba9cb11c feat(REQ-3581) - 调整用印文件按钮响应方式 2025-03-12 16:21:03 +08:00
yanglin
60809b49e2 REQ-3540: 完善接口声明 2025-03-12 16:20:49 +08:00
yanglin
7ec2d28e92 REQ-3540: 完善接口声明 2025-03-12 16:19:43 +08:00
5c0636578f feat(REQ-3798) - 调整施工区域的名称拼接 2025-03-12 14:45:50 +08:00
yanglin
dd88e4d889 REQ-3540: 更新表 2025-03-12 11:44:15 +08:00
yanglin
cee6f39515 Merge remote-tracking branch 'origin/feature/REQ-3540' into feature/REQ-3540 2025-03-12 11:33:10 +08:00
yanglin
719a11869e REQ-3540: 更新表 2025-03-12 11:33:07 +08:00