Commit Graph

698 Commits

Author SHA1 Message Date
潘荣晟
793a5acba9 联系人和税码去掉权限 2026-01-15 17:25:24 +08:00
潘荣晟
93aff069c5 联系人和税码去掉权限 2026-01-15 17:13:42 +08:00
潘荣晟
f2f4170b0e Merge remote-tracking branch 'origin/dev' into dev 2026-01-15 17:04:18 +08:00
潘荣晟
5d812fb149 联系人和税码去掉权限 2026-01-15 17:03:37 +08:00
qianshijiang
e7e1f0ace6 erp修改 2026-01-15 16:55:01 +08:00
潘荣晟
cd5a942f7b 合同资金拆分实现 2026-01-15 16:43:31 +08:00
ranke
b819904205 Merge branch 'dev' into test
* dev:
  修改私服地址
2026-01-15 14:45:28 +08:00
ranke
7c61b8eacf 修改私服地址 2026-01-15 14:45:16 +08:00
chenbowen
22e0a30a74 1. 移除错误的引用 2026-01-15 12:01:47 +08:00
chenbowen
a279414aef Merge branch 'refs/heads/dev' into test 2026-01-15 11:29:57 +08:00
chenbowen
34205bc1a6 1. 移除错误的引用 2026-01-15 11:29:36 +08:00
ranke
b2e56f1c7f Merge branch 'dev' into test
* dev:
  增加快照发布配置
  数据库唯一校验
2026-01-15 08:52:44 +08:00
ranke
5877705ac3 增加快照发布配置 2026-01-15 08:45:16 +08:00
潘荣晟
b5f142cc3e 数据库唯一校验 2026-01-14 17:45:15 +08:00
chenbowen
62914e6055 Merge branch 'refs/heads/dev' into test 2026-01-14 17:04:03 +08:00
chenbowen
af6b6342c1 1. 提交主数据同步的数据源信息 2026-01-14 17:03:30 +08:00
潘荣晟
11318f10b1 Merge remote-tracking branch 'origin/dev' into dev 2026-01-14 15:50:26 +08:00
潘荣晟
97b71a1e8c 数据库唯一校验 2026-01-14 15:50:07 +08:00
qianshijiang
1732d1424b erp修改 2026-01-14 15:41:49 +08:00
ranke
f8d83607a7 组织物料属性展示弹窗,新增通用物料属性的只读展示, 优化物料信息查询效率 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=706 2026-01-14 15:25:00 +08:00
wuzongyong
9ea70b0dc4 feat(job): 添加测试的xxljob 2026-01-14 15:22:23 +08:00
wuzongyong
bea4a3fe74 feat(job): 添加测试的xxljob 2026-01-14 15:21:42 +08:00
qianshijiang
f33259910b Merge remote-tracking branch 'origin/dev' into test 2026-01-14 14:37:38 +08:00
qianshijiang
c31b08f648 erp修改 2026-01-14 14:37:15 +08:00
qianshijiang
cd294b3d3f erp修改 2026-01-14 14:33:26 +08:00
潘荣晟
3e93981058 权限标识相关功能修复 2026-01-14 14:12:29 +08:00
qianshijiang
9f2f242dd8 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:50:36 +08:00
qianshijiang
2ebfa4ab9a erp修改 2026-01-14 11:49:40 +08:00
qianshijiang
00c0a53c68 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:44:47 +08:00
qianshijiang
078dca116a erp修改 2026-01-14 11:44:09 +08:00
qianshijiang
ae4371be81 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:18:45 +08:00
qianshijiang
b0a1c62c1e erp修改 2026-01-14 11:18:19 +08:00
qianshijiang
438955dd63 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 09:26:20 +08:00
潘荣晟
44ee8b5ec9 Merge remote-tracking branch 'origin/dev' into dev 2026-01-14 09:17:37 +08:00
潘荣晟
08a8929829 权限标识相关功能修复 2026-01-13 17:51:07 +08:00
chenbowen
537bbc0742 1. 同步物料编码调整为中铝编码 2026-01-13 17:37:12 +08:00
chenbowen
77603fa14a 1. 调整 api 查询方法支持 2026-01-13 16:56:38 +08:00
潘荣晟
e2db356035 权限标识相关功能修复 2026-01-13 15:47:04 +08:00
潘荣晟
0627738efb 权限标识相关功能修复 2026-01-13 14:08:55 +08:00
qianshijiang
1b61bd576b erp修改 2026-01-12 16:24:27 +08:00
liss
6a25cd9c2c erp 代码权限修改 2026-01-12 11:37:57 +08:00
ranke
47fd100b44 组织架构物料管理新增组织级别的属性管理 http://172.16.46.63:31560/index.php?m=task&f=view&id=688 2026-01-12 10:38:09 +08:00
qianshijiang
1ea3e847b4 erp修改 2026-01-09 17:37:30 +08:00
qianshijiang
57d07bc1da erp修改 2026-01-09 17:22:25 +08:00
qianshijiang
10d0dd1dc2 erp修改 2026-01-09 15:37:07 +08:00
qianshijiang
512c998d7d 收发货规则修改 2026-01-09 09:38:52 +08:00
qianshijiang
9d4c938083 Merge remote-tracking branch 'origin/dev' into test 2026-01-08 17:58:57 +08:00
潘荣晟
47b256c8d0 新增库位新表的相关功能,修复合同收发货规则 2026-01-08 17:58:14 +08:00
wuzongyong
c5da270de1 feat(material): 更新物料信息响应DTO的JSON序列化配置,解决问题使用id调用feign接口查询返回为null的问题,任务id690
- 为ID、编码、名称、分类ID、备注和创建时间字段添加JsonProperty注解
- 将flatAttributes字段初始化为LinkedHashMap以保证顺序
- 添加JsonAnySetter注解和addAttribute方法处理动态属性
- 移除原flatAttributes字段的序列化展开说明
2026-01-08 17:23:36 +08:00
wuzongyong
5add91ea01 feat(material): 更新物料信息响应DTO的JSON序列化配置,解决问题使用id调用feign接口查询返回为null的问题,任务id690
- 为ID、编码、名称、分类ID、备注和创建时间字段添加JsonProperty注解
- 将flatAttributes字段初始化为LinkedHashMap以保证顺序
- 添加JsonAnySetter注解和addAttribute方法处理动态属性
- 移除原flatAttributes字段的序列化展开说明
2026-01-08 17:23:03 +08:00