# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: 556bcd64

Former-commit-id: fdec2117

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java


Former-commit-id: 6df05600

Former-commit-id: 448e3625

Former-commit-id: c1006309

Former-commit-id: c4368862

Former-commit-id: a647b4d8

Former-commit-id: eca01eb2

Former-commit-id: 91f0fd3b

Former-commit-id: 66ae8287

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java


Former-commit-id: 9d9d3797

Former-commit-id: 01f58ef3

Former-commit-id: 531e0e92

Former-commit-id: 5ef4fd88

Former-commit-id: eba31f02

Former-commit-id: 6ac0cbdf

Former-commit-id: 3afcd979

Former-commit-id: c16c46fe

Former-commit-id: 85aee18c

Former-commit-id: dbc5f873

Former-commit-id: 7985599a

Former-commit-id: 62414cca