# Conflicts:
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation.jmx
#	backend/xyst.dinas.sales/src/main/resources/META-INF/spring.factories
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx
#	backend/xyst.dinas.sales/src/main/resources/config/CoefficientOrPrice.hbm.xml
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch.jmx