Commit 3512bc9b by lei wang

冲突解决

parent 2d21667c
......@@ -33,52 +33,9 @@ import Trndtl from './Trnrel/Trndtl'
import Infpta from './Infpta'
import Ditdck from './Ditdck'
import Brtset from './Brtset'
import Letdrv from './Letdrv'
import Letsel from './Letsel'
import Letopn from './Letopn'
import Letamc from './Letamc'
import Letame from './Letame'
import Letdrw from './Letdrw'
import Letdav from './Letdav'
import Cptadv from './Cptadv'
import Gctadd from './Gctadd'
import Gitpca from './Gitpca'
import Botrad from './Botrad'
import Gitatt from './Gitatt'
import Cptopn from './Cptopn'
import Cptati from './Cptati'
import Cptato from './Cptato'
import Diasel from './Diasel'
import Bopsel from './Bopsel'
import Boprcv from './Boprcv'
import Bopsnd from './Bopsnd'
import Dbainf from './Dbainf'
import Dbaadd from './Dbaadd'
import Dbaame from './Dbaame'
import Dbadel from './Dbadel'
import Ditame from './Ditame'
import Ditcan from './Ditcan'
import Ditsel from './Ditsel'
import Infdid from './Infdid'
import Ditopn from './Ditopn'
import Office from './Office'
import Sptsel from './Sptsel'
import Sptbrk from './Sptsel/Sptbrk'
import Trnrel from './Trnrel'
import Trnfnd from './Trnrel/Trnfnd'
import Tstopn from './Tstopn'
import Bdtudp from './Bdtudp'
import Bdtdcr from './Bdtdcr'
import Bdtdck from './Bdtdck'
import Bdteus from './Bdteus'
import Trndtl from './Trnrel/Trndtl'
import Infpta from './Infpta'
import Ditdck from './Ditdck'
import Brtset from './Brtset'
import Letdrv from './Letdrv'
......@@ -131,213 +88,10 @@ import Trtame from './Trtame'
import Trtsel from './Trtsel'
import Lttcan from './Lttcan'
// import Infdet from "./Infdet"
import Botsel from './Botsel'
import Infbod from './Infbod'
import Botacc from './Botacc'
import Botpay from './Botpay'
import Botdav from './Botdav'
import Botame from './Botame'
import Botdcr from './Botdcr'
import Botset from './Botset'
import Botcan from './Botcan'
import Infbpd from './Infbpd'
import Inftxm from './Inftxm'
import Bctdav from './Bctdav'
import Bctcan from './Bctcan'
import Inffee from './Inffee'
import Infbcd from './Infbcd'
import Bdtcan from './Bdtcan'
import Fctcan from './Fctcan'
import Fctopn from './Fctopn'
import Bttcan from './Bttcan'
import Bttacc from './Bttacc'
import Cltdav from './Cltdav'
import Cltset from './Cltset'
import Clttra from './Clttra'
import Ditdla from './Ditdla'
import Bdtset from './Bdtset'
import Lttdav from './Lttdav'
import Lttdck from './Lttdck'
import Bttdck from './Bttdck'
import Ccttra from './Ccttra'
import Cctdcr from './Cctdcr'
import Cctset from './Cctset'
import Infccd from './Infccd'
import Infcld from './Infcld'
import Cctdav from './Cctdav'
import Cctsel from './Cctsel'
import Lttopn from './Lttopn'
import Lttame from './Lttame'
import Infbtd from './Infbtd'
import Infltd from './Infltd'
import Bttsnd from './Bttsnd'
import Bttdrv from './Bttdrv'
import Bttdcr from './Bttdcr'
import Bttset from './Bttset'
import Bttrcl from './Bttrcl'
import Betacc from './Betacc'
import Betamc from './Betamc'
import Betrcl from './Betrcl'
import InftrnpsDetail from './Trnrel/InftrnpsDetail'
import TrnfndsDetail from './Trnrel/Trnfnd/TrnfndsDetail'
import Sptpopup from './Sptsel/Sptpopup'
import Infdet from './Infdet'
import Infbfd from './Infbfd'
import Detopn from './Detopn'
import Detame from './Detame'
import Detsel from './Detsel'
import Bftsnd from './Bftsnd'
import Bftset from './Bftset'
import Bftcan from './Bftcan'
import Detdrv from './Detdrv'
import Bftacc from './Bftacc'
import Bftdcr from './Bftdcr'
import Bftdrv from './Bftdrv'
import ExamRule from './ExamRule'
import Gitcom from './Gitcom'
import Giteng from './Giteng'
import Gitopn from './Gitopn'
import Gitpop from './Gitpop'
import Gitame from './Gitame'
import Gitsel from './Gitsel'
import Infgid from './Infgid'
import Gitset from './Gitset'
import Gitcrq from './Gitcrq'
import Gitadd from './Gitadd'
import Infgcd from './Infgcd'
import Getsel from './Getsel'
import Getopn from './Getopn'
import Getame from './Getame'
import Getset from './Getset'
import Getcrq from './Getcrq'
import Getamc from './Getamc'
import Betdcr from './Betdcr'
import Betdrv from './Betdrv'
import Betsnd from './Betsnd'
import Betcan from './Betcan'
import Betset from './Betset'
import Letnot from './Letnot'
import Ditdav from './Ditdav'
// import Infpty from "./Infpty"
// import Dbipty from "./Dbipty"
import Notice from './Notice'
import Iaefts from './Iaefts'
import Expben from './Expben'
import Busvol from './Busvol'
import AssetInfo from './AssetInfo'
import AssetPub from './AssetPub'
import Fund from './Fund'
import Brtdck from './Brtdck'
import Brtcsg from './Brtcsg'
import Brteus from './Brteus'
import Brtudp from './Brtudp'
import Brtcan from './Brtcan'
import Brtsnd from './Brtsnd'
import Litsel from './Litsel'
import Litame from './Litame'
import Brtdcr from './Brtdcr'
import Brtacp from './Brtacp'
import Brtame from './Brtame'
import Litrog from './Litrog'
import Litacp from './Litacp'
import Litdla from './Litdla'
import Bctsel from './Bctsel'
import Cnysel from './Cnysel'
import Cptrel from './Cptrel'
import Cptcan from './Cptcan'
import Cptrep from './Cptrep'
import Cptbat from './Cptbat'
import Sptcpt from './Sptcpt'
import Getcan from './Getcan'
import Gitcan from './Gitcan'
import Gitcrj from './Gitcrj'
import Gctcan from './Gctcan'
import Gitfre from './Gitfre'
import Trtrcl from './Trtrcl'
import Trtset from './Trtset'
import Trtcan from './Trtcan'
// import Dbiusr from "./Dbiusr"
// import Dbibch from "./Dbibch"
// import Infact from "./Infact"
import Dbbinf from './Dbbinf'
import Dbbadd from './Dbbadd'
import Dbbame from './Dbbame'
import Dbbdel from './Dbbdel'
import Dbcinf from './Dbcinf'
import Dbcadd from './Dbcadd'
import Dbcame from './Dbcame'
import Dbcdel from './Dbcdel'
import Dbdinf from './Dbdinf'
import Dbdadd from './Dbdadd'
import Dbdame from './Dbdame'
import Dbddel from './Dbddel'
import Cfasel from './Cfasel'
import Dbjadd from './Dbjadd'
import Dbjdel from './Dbjdel'
import Dbjame from './Dbjame'
import Dbjinf from './Dbjinf'
import Dbwadd from './Dbwadd'
import Dbwdel from './Dbwdel'
import Dbwame from './Dbwame'
import Dbwinf from './Dbwinf'
import Eadadd from './Eadadd'
import Eadinf from './Eadinf'
import Eadame from './Eadame'
import Eaddel from './Eaddel'
import Eafadd from './Eafadd'
import Eafinf from './Eafinf'
import Eafame from './Eafame'
import Eafdel from './Eafdel'
import Ebaadd from './Ebaadd'
import Ebaame from './Ebaame'
import Ebadel from './Ebadel'
import Ebainf from './Ebainf'
import Ecaadd from './Ecaadd'
import Ecaame from './Ecaame'
import Ecadel from './Ecadel'
import Ecainf from './Ecainf'
import Dbeadd from './Dbeadd'
import Dbeame from './Dbeame'
import Dbedel from './Dbedel'
import Dbeinf from './Dbeinf'
import Dbfadd from './Dbfadd'
import Dbfame from './Dbfame'
import Dbfdel from './Dbfdel'
import Dbfinf from './Dbfinf'
import Gitdla from './Gitdla'
import Getfee from './Getfee'
//添加静态交易路由
import Infact from '~/views/Statics/Infact'
import Dbiact from '~/views/Statics/Dbiact'
import Dbaact from '~/views/Statics/Dbaact'
import Dbeact from '~/views/Statics/Dbeact'
import Dbdact from '~/views/Statics/Dbdact'
import Infatp from '~/views/Statics/Infatp'
import Dbiatp from '~/views/Statics/Dbiatp'
import Dbaatp from '~/views/Statics/Dbaatp'
import Dbeatp from '~/views/Statics/Dbeatp'
import Dbdatp from '~/views/Statics/Dbdatp'
import Infbch from '~/views/Statics/Infbch'
import Dbibch from '~/views/Statics/Dbibch'
import Dbabch from '~/views/Statics/Dbabch'
import Dbebch from '~/views/Statics/Dbebch'
import Dbdbch from '~/views/Statics/Dbdbch'
import Infoit from '~/views/Statics/Infoit'
import Dbioit from '~/views/Statics/Dbioit'
......@@ -345,47 +99,6 @@ import Dbaoit from '~/views/Statics/Dbaoit'
import Dbeoit from '~/views/Statics/Dbeoit'
import Dbdoit from '~/views/Statics/Dbdoit'
import Infcty from '~/views/Statics/Infcty'
import Dbicty from '~/views/Statics/Dbicty'
import Dbacty from '~/views/Statics/Dbacty'
import Dbecty from '~/views/Statics/Dbecty'
import Dbdcty from '~/views/Statics/Dbdcty'
import Infcur from '~/views/Statics/Infcur'
import Dbacur from '~/views/Statics/Dbacur'
import Dbicur from '~/views/Statics/Dbicur'
import Dbecur from '~/views/Statics/Dbecur'
import Dbdcur from '~/views/Statics/Dbdcur'
import Inffec from '~/views/Statics/Inffec'
import Dbifec from '~/views/Statics/Dbifec'
import Dbafec from '~/views/Statics/Dbafec'
import Dbefec from '~/views/Statics/Dbefec'
import Dbdfec from '~/views/Statics/Dbdfec'
import Infgtx from '~/views/Statics/Infgtx'
import Dbigtx from '~/views/Statics/Dbigtx'
import Dbagtx from '~/views/Statics/Dbagtx'
import Dbegtx from '~/views/Statics/Dbegtx'
import Dbdgtx from '~/views/Statics/Dbdgtx'
import Infpty from '~/views/Statics/Infpty'
import Dbipty from '~/views/Statics/Dbipty'
import Dbapty from '~/views/Statics/Dbapty'
import Dbepty from '~/views/Statics/Dbepty'
import Dbdpty from '~/views/Statics/Dbdpty'
import Inftrl from '~/views/Statics/Inftrl'
import Dbitrl from '~/views/Statics/Dbitrl'
import Dbatrl from '~/views/Statics/Dbatrl'
import Dbetrl from '~/views/Statics/Dbetrl'
import Dbdtrl from '~/views/Statics/Dbdtrl'
import Infusr from '~/views/Statics/Infusr'
import Dbausr from '~/views/Statics/Dbausr'
import Dbiusr from '~/views/Statics/Dbiusr'
import Dbeusr from '~/views/Statics/Dbeusr'
import Dbdusr from '~/views/Statics/Dbdusr'
import Botsel from './Botsel'
import Infbod from './Infbod'
import Botacc from './Botacc'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment