Conflicts:
	src/main/resources/application.properties
	src/main/resources/quartz.properties

1、销售管理添加部件逻辑调整，
2、物料清单不能修改部件并且部件总量部不根据零件重量汇总
3、报工删除同步删除生产入库

 Conflicts:
	src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
	src/main/resources/resources/ibatis/sqlmap-config.xml

 Conflicts:
	src/main/java/com/baosight/hpjx/core/enums/DocRouteEnum.java