1. 25 Apr, 2022 5 commits
  2. 24 Apr, 2022 4 commits
  3. 22 Apr, 2022 1 commit
  4. 21 Apr, 2022 6 commits
  5. 20 Apr, 2022 2 commits
  6. 19 Apr, 2022 5 commits
  7. 15 Apr, 2022 2 commits
  8. 14 Apr, 2022 1 commit
  9. 13 Apr, 2022 10 commits
    • 修改id冲突 · bafed41d
      shiwenbo authored
    • 修改id冲突 · c984175c
      shiwenbo authored
    • [新增] 运船量方 · f193cefa
      yanHeng authored
    • [新增] 运船量方 · 8e27a890
      yanHeng authored
    • Merge branch 'feature/vehicle-amount-party' into feature/sales_management · 87745197
      # 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
      yanHeng authored
    • Merge branches 'develop' and 'feature/sales_management' of… · ebde4601
      Merge branches 'develop' and 'feature/sales_management' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into feature/sales_management
      yanHeng authored
    • [初始化] 运船量方init · 9550e86d
      yanHeng authored
    • Merge branches 'develop' and 'feature/vehicle-amount-party' of… · 2f6a2742
      Merge branches 'develop' and 'feature/vehicle-amount-party' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into feature/vehicle-amount-party
      
       Conflicts:
      	backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
      yanHeng authored
  10. 12 Apr, 2022 4 commits