~yuanhung/nddRoadImport.git

ndd_roadimport

Dennis Kao

2014-04-07 716c0c924e258506155aac628e3ed02eccb5af4b

refs
author	Dennis Kao <ulysseskao@gmail.com>
	Monday, April 7, 2014 15:20 +0800
committer	Dennis Kao <ulysseskao@gmail.com>
	Monday, April 7, 2014 15:20 +0800
commit	716c0c924e258506155aac628e3ed02eccb5af4b
tree	96f0f8ebb7cbf5ad539346ebcec4bf2cda394b88 tree \| zip \| gz
parent	bc926822dddd05d55678696999e3b8b0fd415570 view \| diff 0193b6e730bc9e9aa096a955f2561fe3c257a914 view \| diff

Merge branch 'origin/dmms_roadfee'

Conflicts:
	xdgnjobs/ximple-jobcarrier/quartz.properties
	xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties

2 files modified

3 files added

	xdgnjobs/ximple-jobcarrier/quartz.properties	72 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/quartz_jobs_dmmsroadfee.xml	173 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties	5 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_dmmsroadfee.xml	173 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSRoadfeeCalculateJob.java	1895 ●●●●● diff \| view \| raw \| blame \| history