Commits · 0b97458a975367e174076d3a020123e31f9efee2 · 鲁鑫 / topsun-bpm

12 Dec, 2023 9 commits
- 制造详情回显 · 0b97458a
  王航 authored Dec 12, 2023
  
  0b97458a
- Merge remote-tracking branch 'origin/dev' into dev · 052ff6c4
  王航 authored Dec 12, 2023
  
  052ff6c4
- 修复已知问题 · b097e207
  wanghang authored Dec 12, 2023
  
  b097e207
- 修复已知问题 · 88ffcd84
  wanghang authored Dec 12, 2023
  
  88ffcd84
- 修复已知问题 · cd061dfd
  wanghang authored Dec 12, 2023
  
  cd061dfd
- 修复工艺二次保存数据丢失 · 55cda941
  wanghang authored Dec 12, 2023
  
  55cda941
- Merge remote-tracking branch 'origin/dev' into dev · 7b556ace
  覃振观 authored Dec 12, 2023
  
  7b556ace
- 23-12-12: 所有主键改为数字类型。产品编码使用单独字段显示。 · 834b90fb
  覃振观 authored Dec 12, 2023
  
  834b90fb
- 修复工艺二次保存数据丢失 · 19118593
  wanghang authored Dec 12, 2023
  
  19118593
11 Dec, 2023 11 commits
- 23-12-11: Test 下班前提交代码 JS 保留对象关系。 · 2deeb9f9
  覃振观 authored Dec 11, 2023
  
  2deeb9f9
- Merge remote-tracking branch 'origin/dev' into dev · 93c573c3
  wanghang authored Dec 11, 2023
  
  93c573c3
- 工艺回显 · dfb057bd
  wanghang authored Dec 11, 2023
  
  dfb057bd
- 测试能否提交代码 · fbe64219
  全洪江 authored Dec 11, 2023
  
  fbe64219
- Merge branch 'dev' of http://git.local.topsunit.com/xinlu/topsun-bpm into dev · acdc257f
  全洪江 authored Dec 11, 2023
  
  acdc257f
- start · fad2d463
  全洪江 authored Dec 11, 2023
  
  fad2d463
- 1 · f2f72ea0
  全洪江 authored Dec 11, 2023
  
  f2f72ea0
- Merge remote-tracking branch 'origin/dev' into dev · e511281d
  wanghang authored Dec 11, 2023
```
# Conflicts:
#	topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
```
  e511281d
- 改动 · 847295e3
  wanghang authored Dec 11, 2023
  
  847295e3
- 修改 · 2ce04f71
  赵汉亭 authored Dec 11, 2023
  
  2ce04f71
- Merge remote-tracking branch 'zht/dev' into dev · ed5e0bd7
  赵汉亭 authored Dec 11, 2023
  
  ed5e0bd7
10 Dec, 2023 1 commit
- JS 属性映射 · bb5a4d96
  覃振观 authored Dec 10, 2023
  
  bb5a4d96
09 Dec, 2023 5 commits
- 改动 · 55069726
  wanghang authored Dec 09, 2023
  
  55069726
- 23-12-9: Test 下班前提交代码 · eb248650
  覃振观 authored Dec 09, 2023
  
  eb248650
- 23-12-9: 产品模块实体调整。 · 4982d37e
  覃振观 authored Dec 09, 2023
  
  4982d37e
- Merge remote-tracking branch 'origin/dev' into dev · c0f51d3f
  覃振观 authored Dec 09, 2023
  
  c0f51d3f
- 23-12-9: 产品模块实体调整。 · 8163778c
  覃振观 authored Dec 09, 2023
  
  8163778c
08 Dec, 2023 8 commits
- Merge remote-tracking branch 'origin/dev' into dev · b0a529c2
  wanghang authored Dec 08, 2023
  
  b0a529c2
- 改动 · 0c784c8f
  wanghang authored Dec 08, 2023
  
  0c784c8f
- 23-12-8: Class 调整。调整传输数据格式。 · b868d9de
  覃振观 authored Dec 08, 2023
  
  b868d9de
- 尺码组信息流程创建 · 7b955dae
  赵汉亭 authored Dec 08, 2023
  
  7b955dae
- 报价单打印预览 · cfc39d86
  鲁鑫 authored Dec 08, 2023
  
  cfc39d86
- Merge remote-tracking branch 'origin/dev' into dev · 28ea8694
  覃振观 authored Dec 08, 2023
  
  28ea8694
- 尺码组实体 · 0e802bc6
  鲁鑫 authored Dec 08, 2023
  
  0e802bc6
- 不发送邮件提醒 · 97397444
  鲁鑫 authored Dec 08, 2023
  
  97397444
07 Dec, 2023 1 commit
- 23-12-7: Class panel · 04d91d81
  覃振观 authored Dec 07, 2023
  
  04d91d81
05 Dec, 2023 2 commits
- 检查 · 1e7f4f57
  覃振观 authored Dec 05, 2023
  
  1e7f4f57
- 23-12-5 · e72017b4
  覃振观 authored Dec 05, 2023
  
  e72017b4
04 Dec, 2023 3 commits
- 指导单 · 75ac4ca3
  wanghang authored Dec 04, 2023
  
  75ac4ca3
- Merge remote-tracking branch 'origin/dev' into dev · 5486dfcd
  wanghang authored Dec 04, 2023
```
# Conflicts:
#	topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java
```
  5486dfcd
- Merge remote-tracking branch 'origin/dev' into dev · 21076f4a
  wanghang authored Dec 04, 2023
  
  21076f4a