Commit Graph

152 Commits

Author SHA1 Message Date
chenbowen
4956f81a83 修复 xxl-job 端口配置错误问题 2025-10-10 09:51:55 +08:00
guojunyun
6cb5903305 合同数据结构修改 2025-10-10 09:51:54 +08:00
guojunyun
895aaf7c2e 合同数据结构修改、合同审核接口部分代码 2025-10-10 09:51:54 +08:00
潘荣晟
f76338cf8a 新增业务逻辑 2025-10-10 09:51:54 +08:00
chenbowen
556a7f5413 新增 xxl-job 回调端口映射 2025-10-09 09:17:54 +08:00
liss
526ba98270 Merge branch 'refs/heads/dev' into test 2025-09-30 10:58:03 +08:00
liss
88b5ae2b64 优化异常抛出 2025-09-30 10:56:58 +08:00
zhangt
41250ab127 调整收货erp接口 2025-09-29 18:10:25 +08:00
guojunyun
1d9521b0d1 合同内容校验 2025-09-29 17:57:59 +08:00
guojunyun
a596b6f320 合同主信息字段添加、合同提交审核校验、合同新增接口修改 2025-09-29 16:19:38 +08:00
潘荣晟
db23f63cbf Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 15:50:38 +08:00
潘荣晟
7b304c1529 新增启用接口 2025-09-29 15:49:53 +08:00
liss
69680f83a2 Merge branch 'refs/heads/dev' into test 2025-09-29 12:01:33 +08:00
liss
e7a499fa01 账户添加字段 2025-09-29 12:00:59 +08:00
潘荣晟
9cdd7db87a 添加代码注释 2025-09-29 11:40:32 +08:00
潘荣晟
d1fa34f8e1 修复ErrorCodeConstants文件的内容 2025-09-29 11:27:21 +08:00
潘荣晟
4d79d1c676 修复mapper的xml文件内容 2025-09-29 11:07:30 +08:00
付鹏飞
c2170cb7e4 Merge branch 'dev' into 'test'
条款新增bug修复

See merge request jygk/dsc-base!10
2025-09-29 01:17:19 +00:00
潘荣晟
b95b35896d Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 17:53:17 +08:00
潘荣晟
5d16c8b9ab 修改TemplateInstanceItemSaveReqVO类属性val的校验规则为可以为空 2025-09-28 17:53:00 +08:00
guojunyun
26ecb030c9 合同提交审批、合同主信息字段修改、合同明细字段修改、合同内容校验、zt-module-base-server引入版本号引用变量修改 2025-09-28 17:45:19 +08:00
liss
2dc7e2b312 Merge branch 'refs/heads/dev' into test 2025-09-28 17:06:47 +08:00
liss
3860d7578e Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 17:05:46 +08:00
liss
04949bb027 物料管理decimal字段关键字冲突,改为decimalValue 2025-09-28 17:05:30 +08:00
付鹏飞
86724233c8 Merge branch 'dev' into 'test'
Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。

See merge request jygk/dsc-base!9
2025-09-28 08:51:35 +00:00
潘荣晟
982506eabd Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。 2025-09-28 16:50:16 +08:00
付鹏飞
ccf3cf125f Merge branch 'dev' into 'test'
Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。

See merge request jygk/dsc-base!8
2025-09-28 08:44:05 +00:00
潘荣晟
9cd8a41863 Bug修复。主要修复内容校验条款和字段在同一个合同实例中的唯一性。 2025-09-28 16:36:09 +08:00
潘荣晟
ced4c519dc 模版编制相关实现 2025-09-28 16:26:00 +08:00
付鹏飞
a3611ee6f8 Merge branch 'dev' into 'test'
bug优化

See merge request jygk/dsc-base!7
2025-09-28 08:17:43 +00:00
潘荣晟
66ef2a9264 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 16:07:04 +08:00
潘荣晟
ca2b1c0b63 模版编制相关实现 2025-09-28 16:06:21 +08:00
chenbowen
7965aa6eca 升级 3.0.41 2025-09-28 16:02:54 +08:00
潘荣晟
646d847d46 模版编制相关实现 2025-09-28 15:26:54 +08:00
潘荣晟
6b77c9033e Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 15:11:53 +08:00
潘荣晟
5463bc3d16 模版编制相关实现 2025-09-28 15:11:23 +08:00
chenbowen
2e629b8dc9 统一设置 api 调用时路由的服务 2025-09-28 12:17:55 +08:00
liss
32a5bb7d0a Merge branch 'refs/heads/dev' into test 2025-09-28 11:10:08 +08:00
liss
1fb32bc43f 仓库最大code查询优化 2025-09-28 11:09:32 +08:00
liss
0723c45b96 公司、工厂新增ui对应缺少字段 2025-09-28 10:47:10 +08:00
chenbowen
08c3ffef4f 1.升级版本 3.0.40 2025-09-28 00:39:22 +08:00
付鹏飞
128f97f073 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!6
2025-09-26 09:43:44 +00:00
潘荣晟
dca1830c1b 模版编制相关实现 2025-09-26 17:41:55 +08:00
付鹏飞
da3065c637 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!5
2025-09-26 09:17:41 +00:00
潘荣晟
fa7c08a493 模版编制相关实现 2025-09-26 17:13:10 +08:00
付鹏飞
ba69d40776 Merge branch 'dev' into 'test'
模版编制相关实现

See merge request jygk/dsc-base!3
2025-09-26 08:45:10 +00:00
潘荣晟
abf9607c43 模版编制相关实现 2025-09-26 16:43:34 +08:00
潘荣晟
3e70de3977 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 16:42:33 +08:00
潘荣晟
7507a53c8a 模版编制相关实现 2025-09-26 16:41:11 +08:00
liss
e3b918f0cb Merge branch 'refs/heads/dev' into test 2025-09-26 15:50:21 +08:00