Commits · 29be97693007f3e011d323b33577c3085e980672 · 佟礼 / HYH.APSJ

20 Sep, 2026 7 commits
- Merge remote-tracking branch 'origin/tl' · 29be9769
  Tong Li authored Sep 20, 2026
  
  29be9769
- MP · d0f5cbe5
  Tong Li authored Sep 20, 2026
  
  d0f5cbe5
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  实体 · 9f10bbc6
  DESKTOP-VKRD9QF\Administration authored Sep 20, 2026
  
  9f10bbc6
- Merge remote-tracking branch 'origin/master' into tl · 0fd5e9c9
  Tong Li authored Sep 20, 2026
```
# Conflicts:
#	src/main/java/com/aps/controller/MacroPlannerResultController.java
#	src/main/java/com/aps/macroplanner/output/ResultWriter.java
```
  0fd5e9c9
- MP · 4cad6053
  Tong Li authored Sep 20, 2026
  
  4cad6053
- MP · be4b7722
  Tong Li authored Sep 20, 2026
  
  be4b7722
- MP · d1745f27
  Tong Li authored Sep 20, 2026
  
  d1745f27
16 Sep, 2026 2 commits
- MP · 5b411bad
  Tong Li authored Sep 16, 2026
  
  5b411bad
- MP · ea3cc142
  Tong Li authored Sep 16, 2026
  
  ea3cc142
15 Sep, 2026 1 commit
- MP · f11971ca
  Tong Li authored Sep 15, 2026
  
  f11971ca
14 Sep, 2026 3 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  merge: integrate remote macro planner changes · f76aaece
  DESKTOP-VKRD9QF\Administration authored Sep 14, 2026
  
  f76aaece
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  feat: support default macro scene mode and clean scene results · 7017fffd
  DESKTOP-VKRD9QF\Administration authored Sep 14, 2026
  
  7017fffd
- MP · 2ec4b057
  Tong Li authored Sep 14, 2026
  
  2ec4b057
10 Sep, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  feat: add bulk result persistence and macro scene selection · 7d6de509
  DESKTOP-VKRD9QF\Administration authored Sep 10, 2026
  
  7d6de509
09 Sep, 2026 2 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj · 2c825897
  DESKTOP-VKRD9QF\Administration authored Sep 09, 2026
  
  2c825897
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  明确主计划场景接口路径 · 3a617ad9
  DESKTOP-VKRD9QF\Administration authored Sep 09, 2026
  
  3a617ad9
08 Sep, 2026 7 commits
- MP · 7b9698da
  Tong Li authored Sep 08, 2026
  
  7b9698da
- MP · 0cdb4f74
  Tong Li authored Sep 08, 2026
  
  0cdb4f74
- MP · 728d845f
  Tong Li authored Sep 08, 2026
  
  728d845f
- MP · 51f71b5f
  Tong Li authored Sep 08, 2026
  
  51f71b5f
- MP · 38a88ea8
  Tong Li authored Sep 08, 2026
  
  38a88ea8
- Merge remote-tracking branch 'origin/master' · a1b5ec14
  Tong Li authored Sep 08, 2026
```
# Conflicts:
#	src/main/java/com/aps/macroplanner/data/MacroPlannerDataConverter.java
```
  a1b5ec14
- MP · aaf66e2d
  Tong Li authored Sep 08, 2026
  
  aaf66e2d
07 Sep, 2026 5 commits
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  合并远端master并保留主计划场景逻辑 · bb3dce7b
  DESKTOP-VKRD9QF\Administration authored Sep 07, 2026
  
  bb3dce7b
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  完善主计划场景隔离与排产兼容 · b0e9cc4a
  DESKTOP-VKRD9QF\Administration authored Sep 07, 2026
  
  b0e9cc4a
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  分页 · 8ada9aff
  DESKTOP-VKRD9QF\Administration authored Sep 07, 2026
  
  8ada9aff
- Merge remote-tracking branch 'origin/tl' · b70a4972
  Tong Li authored Sep 07, 2026
  
  b70a4972
- MP · 2521e779
  Tong Li authored Sep 07, 2026
  
  2521e779
04 Sep, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  工单分页接口 · 0babbc59
  DESKTOP-VKRD9QF\Administration authored Sep 04, 2026
  
  0babbc59
02 Sep, 2026 1 commit
- MP · d653ce10
  Tong Li authored Sep 02, 2026
  
  d653ce10
31 Aug, 2026 3 commits
- POA · ff138a40
  Tong Li authored Aug 31, 2026
  
  ff138a40
- Merge remote-tracking branch 'origin/tl' · 78ed82da
  Tong Li authored Aug 31, 2026
  
  78ed82da
- POA · bf94442c
  Tong Li authored Aug 31, 2026
  
  bf94442c
27 Aug, 2026 1 commit
- $DESKTOP-VKRD9QF\Administration's avatar$
  
  feat: 补充宏观排产结果展示字段 · c6e3d8ce
  DESKTOP-VKRD9QF\Administration authored Aug 27, 2026
  
  c6e3d8ce
25 Aug, 2026 2 commits
- POA · 24eee50e
  Tong Li authored Aug 25, 2026
  
  24eee50e
- POA · 2f113266
  Tong Li authored Aug 25, 2026
  
  2f113266
21 Aug, 2026 1 commit
- POA · 1ade661a
  Tong Li authored Aug 21, 2026
  
  1ade661a
20 Aug, 2026 1 commit
- MP · e3a2cdde
  Tong Li authored Aug 20, 2026
  
  e3a2cdde
18 Aug, 2026 1 commit
- MP · 8dc6c378
  Tong Li authored Aug 18, 2026
  
  8dc6c378
14 Aug, 2026 1 commit
- MP · d16de264
  Tong Li authored Aug 14, 2026
  
  d16de264