删除文件

.idea/workspace.xml

@@ -2,368 +2,52 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="631d26d0-dbdb-4f35-89ec-ab0c5d7c0508" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/StaticValues.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseOrgTypeDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBasePunishmentSectionDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseSectionDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseStatusDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseSystemParamDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseUserTypeDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/IBaseWaterPropertiesDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseOrgTypeDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BasePunishmentSectionDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseSectionDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseStatusDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseSystemParamDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseUserTypeDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/dao/impl/BaseWaterPropertiesDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseOrgType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BasePunishmentSection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseSection.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseSystemParam.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseUserType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseWaterProperties.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/enumType/SectionType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/enumType/UserType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/temp/BaseOrgTypeTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/temp/BaseSectionTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/temp/BaseSectionTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseOrgTypeService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBasePunishmentSectionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseSectionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseStatusService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseSystemParamService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseUserTypeService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/IBaseWaterPropertiesService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseOrgTypeServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BasePunishmentSectionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseSectionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseStatusServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseSystemParamServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseUserTypeServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/service/impl/BaseWaterPropertiesServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseOrgTypeController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BasePunishmentSectionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseSectionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseStatusController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseSystemParamController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseUserTypeController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/web/BaseWaterPropertiesController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/dao/IBookingDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/dao/impl/BookingDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/model/Booking.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/service/IBookingService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/service/impl/BookingServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/web/BookingController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/IBpmFormProcessDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/IBpmNodeUserDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/IBpmProcessRunDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/IBpmTaskOpinionDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/impl/BpmFormProcessDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/impl/BpmNodeUserDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/impl/BpmProcessRunDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/dao/impl/BpmTaskOpinionDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/graph/DivShape.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmFormProcess.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmNodeUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmProcessRun.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmTaskOpinion.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/NodeUserMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/temp/ApprovalCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/temp/NodeTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/temp/ProRunRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/temp/ProcessCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/temp/TaskCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/IBpmDefinitionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/IBpmFormProcessService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/IBpmNodeUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/IBpmTaskOpinionService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/IProcessRunService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/ITaskUserAssignService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/BpmDefinitionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/BpmFormProcessServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/BpmNodeUserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/BpmTaskOpinionServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/ProcessRunServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/impl/TaskUserAssignServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/ApplyUnitProcessCompletedListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/BaseNodeEventListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/BaseTaskListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/EndEventListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/StartEventListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/TaskAssignListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/TaskCompleteListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/TaskCreateListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/service/listener/TaskProjectCompleteListener.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/util/BpmUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/web/BpmDefinitionController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/web/BpmFormProcessController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/web/TaskController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusAnnualPlanForWaterDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusCustomerMeterDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusMeterReadInfoDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusOrgDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusOrgWxDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusQuarterlyAssessmentDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/IBusWaterAdjRecDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusAnnualPlanForWaterDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusCustomerMeterDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusMeterReadInfoDaoImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusMeterReadInfoDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusOrgDaoImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusOrgDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusOrgDaoWxImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusQuarterlyAssessmentDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/dao/impl/BusWaterAdjRecDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusAnnualPlanForWater.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusCustomerMeter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusMeterReadInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusOrg.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusOrgWx.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusQuarterlyAssessment.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusWaterAdjRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/Yhjbxx.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/enumType/OrgImportStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/AddWaterTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/AddWaterTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/BusMeterInfoRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/BusOrgTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/BusOrgTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/BusPlanTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/BusQuarterlyAssessmentTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/FirstHalfYearOfAddWaterTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/OrgTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/OrgTypeCountTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/ReplyPrintTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/SecondHalfYearOfAddWaterTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/UnitMonthWaterConsumptionTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/UnitMonthWaterConsumptionTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/UnitMonthWaterDetailTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/UnitWaterMeterTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/UnitWaterMeterTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/YearActualWaterSummaryTemp.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/YearActualWaterSummaryTempRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/temp/unitCountYearRowMap.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusAnnualPlanForWaterService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusCustomerMeterService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusMeterReadInfoService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusOrgService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusOrgWxService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusQuarterlyAssessmentService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/IBusWaterAdjRecService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusAnnualPlanForWaterServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusCustomerMeterServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusMeterReadInfoServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusMeterReadInfoServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusOrgServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusOrgServiceImpl$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusOrgServiceImpl$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusOrgServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusOrgWxServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl$4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl$5.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/service/impl/BusWaterAdjRecServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BarcodeDemo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusAnnualPlanForWaterController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusCustomerMeterController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusInitController$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusInitController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusMeterReadInfoController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusOrgController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusOrgControllerTest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/BusQuarterlyAssessmentController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/web/YearActualWaterSummaryController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/IGenericDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/impl/GenericDaoImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/impl/GenericDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/util/HibernateTree.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/util/MyBeanUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/util/TreeIntercptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/util/Updater$UpdateMode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/dao/util/Updater.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/model/BaseEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/service/IGenericService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/service/impl/GenericServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/AppUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/Arith.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/DBUtils$DataBaseType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/DBUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/DateUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/EncryptUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/EnumValueShow.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/ExcelUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/FileUploadUtils$ImageType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/FileUploadUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/GenericsUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/IKeyValue.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/JsonUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/Page.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/file/DownloadHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/file/DownloadHttpMessageConverter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/util/file/FileUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/BaseController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/DirectiveUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/MustBooleanException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/MustDateException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/MustNumberException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/MustSplitNumberException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/freemarker/MustStringException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/query/ICriteriaCommand.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/query/QueryFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/query/impl/ExampleCommandImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/query/impl/FieldCommandImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/query/impl/SortCommandImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/security/AccessDecisionManagerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/security/AccessDeniedHandlerImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/security/ContextUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/security/PermissionFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/security/SecurityMetadataSourceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/springmvc/DateTypeEditor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/springmvc/RichFreeMarkerView.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/core/web/springmvc/RichFreeMarkerViewResolver.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/dao/IImportDataFileDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/dao/impl/ImportDataFileDaoImpl$CheckType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/dao/impl/ImportDataFileDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/dao/impl/Quartz.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/dao/impl/SyncOracleJob.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/model/ImportDataFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/model/enumType/ImportStatus.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/model/enumType/ImportType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/service/IImportDataFileService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/service/impl/ImportDataFileServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/web/ImportDataFileController$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/web/ImportDataFileController$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/web/ImportDataFileController$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/web/ImportDataFileController$4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/web/ImportDataFileController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IPopOrgDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IPopResourceDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IPopRoleDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IPopUserDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IPopUserOrgDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/IWxOrgDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/PopOrgDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/PopResourceDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/PopRoleDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/PopUserDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/PopUserOrgDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/WxOrgDaoImpl$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/dao/impl/WxOrgDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopOrg.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopResource.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopRole.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopUser.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopUserOrg.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/WxOrg.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/IPopOrgService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/IPopResourceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/IPopRoleService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/IPopUserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/IWxOrgService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/PopOrgServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/PopResourceServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/PopRoleServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/PopUserServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/UserDetailsServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/service/impl/WxOrgServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeDeclareUnitHomeProperty.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeOrgAttachType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeOrgType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeSubOrdinationRelations.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeUnitRegisterCategory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeUnitRegisterType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/type/TypeUnitType.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/view/ViewOrgManageBean.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/FrameController$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/FrameController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/LoginController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/PopOrgController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/PopResourceController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/PopRoleController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/PopUserController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/RegisterController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/WxController$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/WxController$CharsetHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/WxController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/web/directive/PermistionDirective.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/IWaterApprovedDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/IWaterCheckDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/IWaterCheckRecDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/IWaterQuotaDao.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/impl/WaterApprovedDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/impl/WaterCheckDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/impl/WaterCheckRecDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/dao/impl/WaterQuotaDaoImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterApproved.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterCheck.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterCheckRec.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterQuota.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/IWaterApprovedService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/IWaterCheckRecService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/IWaterCheckService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/IWaterQuotaService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/impl/WaterApprovedServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/impl/WaterCheckRecServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/impl/WaterCheckServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/service/impl/WaterQuotaServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/web/WaterCheckController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/web/WaterQuotaController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/common/BaseTestCase.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBaseOrgTypeDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBaseOrgTypeDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBasePunishmentSectionDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBasePunishmentSectionDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBaseSectionDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBaseSectionDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBaseSystemParamDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBaseSystemParamDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBaseUserTypeDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBaseUserTypeDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/IBaseWaterPropertiesDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/IBaseWaterPropertiesDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseOrgTypeDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseOrgTypeDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BasePunishmentSectionDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BasePunishmentSectionDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseSectionDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseSectionDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseSystemParamDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseSystemParamDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseUserTypeDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseUserTypeDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseWaterPropertiesDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/dao/impl/BaseWaterPropertiesDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBaseOrgTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBaseOrgTypeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBasePunishmentSectionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBasePunishmentSectionService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBaseSectionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBaseSectionService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBaseSystemParamService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBaseSystemParamService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBaseUserTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBaseUserTypeService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/IBaseWaterPropertiesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/IBaseWaterPropertiesService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseOrgTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseOrgTypeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BasePunishmentSectionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BasePunishmentSectionServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseSectionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseSectionServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseSystemParamServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseSystemParamServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseUserTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseUserTypeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseWaterPropertiesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/service/impl/BaseWaterPropertiesServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BaseOrgTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BaseOrgTypeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BasePunishmentSectionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BasePunishmentSectionController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BaseSectionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BaseSectionController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BaseSystemParamController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BaseSystemParamController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BaseUserTypeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BaseUserTypeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/base/web/BaseWaterPropertiesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/base/web/BaseWaterPropertiesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/IBusAnnualPlanForWaterDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/IBusAnnualPlanForWaterDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/IBusCustomerMeterDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/IBusCustomerMeterDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/IBusMeterReadInfoDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/IBusMeterReadInfoDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/IBusQuarterlyAssessmentDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/IBusQuarterlyAssessmentDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusAnnualPlanForWaterDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusAnnualPlanForWaterDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusCustomerMeterDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusCustomerMeterDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusMeterReadInfoDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusMeterReadInfoDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusQuarterlyAssessmentDaoImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/dao/impl/BusQuarterlyAssessmentDaoImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/IBusAnnualPlanForWaterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/IBusAnnualPlanForWaterService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/IBusCustomerMeterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/IBusCustomerMeterService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/IBusMeterReadInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/IBusMeterReadInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/IBusQuarterlyAssessmentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/IBusQuarterlyAssessmentService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusAnnualPlanForWaterServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusAnnualPlanForWaterServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusCustomerMeterServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusCustomerMeterServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusMeterReadInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusMeterReadInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/service/impl/BusQuarterlyAssessmentServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/web/BusAnnualPlanForWaterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/web/BusAnnualPlanForWaterController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/web/BusCustomerMeterController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/web/BusCustomerMeterController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/web/BusMeterReadInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/web/BusMeterReadInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/java/com/bus/web/BusQuarterlyAssessmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/java/com/bus/web/BusQuarterlyAssessmentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/MyProcess.bpmn" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseOrgType.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BasePunishmentSection.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseSection.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseStatus.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseSystemParam.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseUserType.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/base/model/BaseWaterProperties.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/booking/model/Booking.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmFormProcess.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmNodeUser.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmProcessRun.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bpm/model/BpmTaskOpinion.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusAnnualPlanForWater.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusCustomerMeter.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusMeterReadInfo.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusOrg.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusOrgWx.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusQuarterlyAssessment.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/BusWaterAdjRec.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/bus/model/Yhjbxx.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/data/model/ImportDataFile.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopOrg.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopResource.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopRole.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopUser.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/PopUserOrg.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/popedom/model/WxOrg.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterApproved.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterCheck.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterCheckRec.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/com/water/model/WaterQuota.hbm.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/config.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/db.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/hibernate.reveng.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/jdbc.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/logback.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/quartz-task.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-activiti.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-context.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-dao.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-directive.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-mvc.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-resources.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-security.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/WebContent/WEB-INF/classes/spring-service.xml" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/WebContent/WEB-INF/classes/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -373,7 +57,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/hibernate.cfg.xml">
           <provider selected="true" editor-type-id="text-editor" />
@@ -409,7 +93,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -422,11 +106,22 @@
               <item name="gxwss" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="gxwss" type="b2602c69:ProjectViewProjectNode" />
+              <item name="gxwss" type="462c0819:PsiDirectoryNode" />
+              <item name="WebContent" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="gxwss" type="b2602c69:ProjectViewProjectNode" />
+              <item name="gxwss" type="462c0819:PsiDirectoryNode" />
+              <item name="WebContent" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -462,28 +157,25 @@
       <option name="presentableId" value="Default" />
       <updated>1606188498488</updated>
       <workItem from="1606188515930" duration="140000" />
+      <workItem from="1606189061309" duration="755000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="140000" />
+    <option name="totallyTimeSpent" value="895000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="UI Designer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17324094" />
+      <window_info id="Persistence" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1748401" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Java Enterprise" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -491,15 +183,20 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Palette" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Maven" weight="0.32995737" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Palette&#9;" />
-      <window_info anchor="right" id="Database" />
+      <window_info anchor="bottom" id="Docker" order="7" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Theme Preview" order="4" />
+      <window_info anchor="right" id="Maven" order="5" weight="0.32995737" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Database" order="8" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -515,6 +212,18 @@
   </component>
   <component name="masterDetails">
     <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="Copyright.UI">
         <settings>
           <splitter-proportions>
@@ -526,6 +235,64 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>gxwss</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
     </states>
   </component>
 </project>

WebContent/WEB-INF/classes/com/MyProcess.bpmn

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
-  <process id="myProcess" name="用水指标审批流程" isExecutable="true">
-     <extensionElements>
-       <activiti:executionListener event="start" class="com.bpm.service.listener.StartEventListener" /> 
-       <activiti:executionListener event="end" class="com.bpm.service.listener.EndEventListener"/>
-    </extensionElements>
-    <startEvent id="startevent1" name="Start"></startEvent>
-    <userTask id="usertask1" name="申请人">
-	    <extensionElements>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCreateListener" event="create" /> 
-			  <activiti:taskListener class="com.bpm.service.listener.TaskAssignListener" event="assignment"/>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCompleteListener" event="complete"/>
-	  	</extensionElements>
-    </userTask>
-    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="usertask1"></sequenceFlow>
-    
-    <userTask id="usertask2" name="审核人">
-	    <extensionElements>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCreateListener" event="create" /> 
-			  <activiti:taskListener class="com.bpm.service.listener.TaskAssignListener" event="assignment"/>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCompleteListener" event="complete"/>
-	  	</extensionElements>    
-    </userTask>
-    <sequenceFlow id="flow2" name="提交给审核人" sourceRef="usertask1" targetRef="usertask2"></sequenceFlow>
-
-    <userTask id="usertask3" name="负责人">
- 	    <extensionElements>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCreateListener" event="create" /> 
-			  <activiti:taskListener class="com.bpm.service.listener.TaskAssignListener" event="assignment"/>
-			  <activiti:taskListener class="com.bpm.service.listener.TaskCompleteListener" event="complete"/>
-	  	</extensionElements>      
-    </userTask>
-    <sequenceFlow id="flow3" name="提交给负责人" sourceRef="usertask2" targetRef="usertask3"></sequenceFlow>
-    
-    <endEvent id="endevent1" name="End"></endEvent>
-    <sequenceFlow id="flow4" name="结束" sourceRef="usertask3" targetRef="endevent1"></sequenceFlow>
-  </process>
-  <bpmndi:BPMNDiagram id="BPMNDiagram_myProcess">
-    <bpmndi:BPMNPlane bpmnElement="myProcess" id="BPMNPlane_myProcess">
-      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="150.0" y="290.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="usertask1" id="BPMNShape_usertask1">
-        <omgdc:Bounds height="55.0" width="105.0" x="250.0" y="280.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="usertask2" id="BPMNShape_usertask2">
-        <omgdc:Bounds height="55.0" width="105.0" x="460.0" y="280.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="usertask3" id="BPMNShape_usertask3">
-        <omgdc:Bounds height="55.0" width="105.0" x="690.0" y="280.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
-        <omgdc:Bounds height="35.0" width="35.0" x="900.0" y="290.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="185.0" y="307.0"></omgdi:waypoint>
-        <omgdi:waypoint x="250.0" y="307.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
-        <omgdi:waypoint x="355.0" y="307.0"></omgdi:waypoint>
-        <omgdi:waypoint x="460.0" y="307.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="355.0" y="307.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
-        <omgdi:waypoint x="565.0" y="307.0"></omgdi:waypoint>
-        <omgdi:waypoint x="690.0" y="307.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="565.0" y="307.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
-        <omgdi:waypoint x="795.0" y="307.0"></omgdi:waypoint>
-        <omgdi:waypoint x="900.0" y="307.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="100.0" x="795.0" y="307.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
-</definitions>

WebContent/WEB-INF/classes/com/base/model/BaseOrgType.hbm.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseOrgType" table="base_org_type">
-        <id name="orgTypeId" type="long">
-            <column name="org_type_id" />
-            <generator class="native" />
-        </id>
-        <property name="orgName" type="string">
-            <column name="org_name" length="10" />
-        </property>
-        <property name="waterPrice" type="java.lang.Float">
-            <column name="water_price" precision="8" scale="0" />
-        </property>
-        <property name="status" type="string">
-            <column name="status" length="10" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark" length="10" />
-        </property>
-        
-        <property name="creater" column="creater"/>
-        <property name="createTime" column="create_time"/>
-        
-        <set name="busOrg" cascade="delete-orphan" inverse="true"> 
-			<key column="org_type_id"/>
-			<one-to-many class="com.bus.model.BusOrg" />
-		</set>
-		
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BasePunishmentSection.hbm.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BasePunishmentSection" table="base_punishment_section">
-        <id name="punishmentId" type="long">
-            <column name="punishment_id" />
-            <generator class="native" />
-        </id>
-        <property name="sectionType" type="string">
-            <column name="section_type" length="10" />
-        </property>
-        <property name="status" type="string">
-            <column name="status" length="10" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark" length="10" />
-        </property>
-<!--         <property name="createrId" type="java.lang.Long"> -->
-<!--             <column name="creater_id" /> -->
-<!--         </property> -->
-		<many-to-one name="creater" class="com.popedom.model.PopUser" not-null="false"> 
-			<column name="userId"/>
-		</many-to-one>
-        <property name="createTime" type="date">
-            <column name="create_time" length="10" />
-        </property>
-<!--         <many-to-one name="userType" class="com.base.model.BaseUserType" not-null="false">  -->
-<!-- 			<column name="user_type_id"/> -->
-<!-- 		</many-to-one> -->
-<!--         <property name="userTypeId" type="long"> -->
-<!--             <column name="user_type_id" not-null="true" /> -->
-<!--         </property> -->
-		<set name="baseSections" cascade="all-delete-orphan" inverse="true"> 
-			<key column="punishment_id"/>
-			<one-to-many class="com.base.model.BaseSection"/>
-		</set>
-		<property name="userType" column="user_type" />
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BaseSection.hbm.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 23:11:51 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseSection" table="base_section">
-        <id name="sectionId" type="long">
-            <column name="section_id" />
-            <generator class="native" />
-        </id>
-<!--         <property name="punishmentId" type="long"> -->
-<!--             <column name="punishment_id" not-null="true" /> -->
-<!--         </property> -->
-        <property name="section" type="java.lang.Integer">
-            <column name="section" />
-        </property>
-        <property name="sectionUpLimit" type="java.lang.Integer">
-            <column name="section_up_limit" />
-        </property>
-        <property name="sectionLowerLimit" type="java.lang.Integer">
-            <column name="section_lower_limit" />
-        </property>
-        <property name="containUp" type="string">
-            <column name="contain_up" length="10" />
-        </property>
-        <property name="containLower" type="string">
-            <column name="contain_lower" length="10" />
-        </property>
-        <property name="fineProportion" type="java.lang.Float">
-            <column name="fine_proportion" precision="8" scale="0" />
-        </property>
-		<many-to-one name="creater" class="com.popedom.model.PopUser" not-null="false"> 
-			<column name="userId"/>
-		</many-to-one>
-		<many-to-one name="basePunishmentSection" class="com.base.model.BasePunishmentSection" not-null="false"> 
-			<column name="punishment_id"/>
-		</many-to-one>
-        <property name="createTime" type="date">
-            <column name="create_time" length="10" />
-        </property>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BaseStatus.hbm.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseStatus" table="base_status">
-        <id name="id" type="long">
-            <column name="id" />
-            <generator class="native" />
-        </id>
-        <property name="statusName" column="status_name"/>
-        <property name="statusColor" column="status_color"/>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BaseSystemParam.hbm.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseSystemParam" table="base_system_param">
-        <id name="paramId" type="long">
-            <column name="param_id" />
-            <generator class="native" />
-        </id>
-        <property name="number" type="string">
-            <column name="number" length="10" />
-        </property>
-        <property name="name" type="string">
-            <column name="name" length="10" />
-        </property>
-        <property name="value" type="string">
-            <column name="value" length="10" />
-        </property>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BaseUserType.hbm.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseUserType" table="base_user_type">
-        <id name="userTypeId" type="long">
-            <column name="user_type_id" />
-            <generator class="native" />
-        </id>
-        <property name="userType" type="string">
-            <column name="user_type"/>
-        </property>
-        
-<!--          <set name="busOrgs" >  -->
-<!--            <key column="userTypeId"></key>   -->
-<!--             <one-to-many class="com.bus.model.BusOrg"/>  -->
-<!--          </set>  -->
-<!--         <set name="punSections" cascade="delete-orphan" inverse="true"> -->
-<!--             <key column="userTypeId"></key> -->
-<!--             <one-to-many class="com.base.model.BasePunishmentSection"/> -->
-        <!-- </set>  -->
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/base/model/BaseWaterProperties.hbm.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:40:29 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.base.model.BaseWaterProperties" table="base_water_properties">
-        <id name="propertiesId" type="long">
-            <column name="properties_id" />
-            <generator class="native" />
-        </id>
-        <property name="number" type="string">
-            <column name="number"/>
-        </property>
-        <property name="propertiesName" type="string">
-            <column name="properties_name"/>
-        </property>
-        <property name="waterPrice" type="java.lang.Float">
-            <column name="water_price" precision="8" scale="0" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark"/>
-        </property>
-		<many-to-one name="creater" class="com.popedom.model.PopUser" not-null="false"> 
-			<column name="userId"/>
-		</many-to-one>
-        <property name="createTime" type="date">
-            <column name="create_time" length="10" />
-        </property>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/booking/model/Booking.hbm.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2017-10-12 15:00:05 by Hibernate Tools 3.5.0.Final -->
-<hibernate-mapping>
-    <class name="com.booking.model.Booking" table="booking">
-        <id name="id" type="int">
-            <column name="ID" />
-            <generator class="native" />
-        </id>
-        <property name="orgId">
-            <column name="orgId" />
-        </property>
-        <property name="name">
-            <column name="name" />
-        </property>
-        <property name="contact">
-            <column name="contact" />
-        </property>
-        <property name="bookingDate">
-            <column name="booking_date" />
-        </property>
-        <property name="bookingTime">
-            <column name="booking_time" />
-        </property>
-        <property name="content">
-            <column name="content" />
-        </property>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bpm/model/BpmFormProcess.hbm.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.bpm.model.BpmFormProcess" table="bpm_form_process">
-		<id name="formId" type="long">
-			<column name="formId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="formCode" />
-		
-		<property name="formName" />
-		
-		<property name="formDescp" />
-		
-		<property name="processDefinitionKey" />
-		
-		<property name="createTime" />
-		
-		<property name="updateTime" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bpm/model/BpmNodeUser.hbm.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.bpm.model.BpmNodeUser" table="bpm_node_user">
-		<id name="nodeUserId" type="long">
-			<column name="nodeUserId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="actDefId" />
-		
-		<property name="nodeId" />
-		
-		<property name="assignType" />
-		
-		<property name="cmpIds" />
-		
-		<property name="cmpNames" />
-		
-		<property name="compType" />
-		
-		<property name="assignUseType" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bpm/model/BpmProcessRun.hbm.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.bpm.model.BpmProcessRun" table="bpm_process_run">
-		<id name="runId" type="long">
-			<column name="runId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="actInstId" />
-		
-		<property name="subject" />
-		
-		<property name="formKey" />
-		
-		<property name="businessKey" />
-		
-		<property name="status" />
-		
-		<property name="creatorId" />
-		
-		<property name="createTime" />
-		
-		<property name="endTime" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bpm/model/BpmTaskOpinion.hbm.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.bpm.model.BpmTaskOpinion" table="bpm_task_opinion">
-		<id name="opinionId" type="long">
-			<column name="opinionId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="actDefId" />
-		
-		<property name="taskName" />
-		
-		<property name="taskKey" />
-		
-		<property name="taskId" />
-		
-		<property name="actInstId" />
-		
-		<property name="startTime" />
-		
-		<property name="endTime" />
-		
-		<property name="exeUserId" />
-		
-		<property name="exeUserName" />
-		
-		<property name="opinion" />
-		
-		<property name="checkStatus" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusAnnualPlanForWater.hbm.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusAnnualPlanForWater" table="bus_annual_plan_for_water">
-        <id name="id" type="long" column="org_id">
-            <generator class="foreign"><param name="property">org</param></generator>
-        </id>
-        
-         <property name="priYearUseWater" type="java.lang.Float">
-            <column name="pri_year_usewater" precision="8" scale="0" />
-        </property>
-        <property name="planOfWater" type="java.lang.Float">
-            <column name="plan_of_water" precision="8" scale="0" />
-        </property>
-        <property name="replyOfWater" type="java.lang.Float">
-            <column name="reply_of_water" precision="8" scale="0" />
-        </property>
-        <property name="firstQuarterPlan" type="java.lang.Float">
-            <column name="first_quarter_plan" precision="8" scale="0" />
-        </property>
-        <property name="firstQuarterReply" type="java.lang.Float">
-            <column name="first_quarter_reply" length="10" />
-        </property>
-        <property name="secondQuarterPlan" type="java.lang.Float">
-            <column name="second_quarter_plan" precision="8" scale="0" />
-        </property>
-        <property name="secondQuarterReply" type="java.lang.Float">
-            <column name="second_quarter_reply" precision="8" scale="0" />
-        </property>
-        <property name="thirdQuarterPlan" type="java.lang.Float">
-            <column name="third_quarter_plan" precision="8" scale="0" />
-        </property>
-        <property name="thirdQuarterReply" type="java.lang.Float">
-            <column name="third_quarter_reply" precision="8" scale="0" />
-        </property>
-        <property name="fourthQuarterPlan" type="java.lang.Float">
-            <column name="fourth_quarter_plan" precision="8" scale="0" />
-        </property>
-        <property name="fourthQuarterReply" type="java.lang.Float">
-            <column name="fourth_quarter_reply" precision="8" scale="0" />
-        </property>
-        <property name="operatorId" type="java.lang.Long">
-            <column name="operator_id" />
-        </property>
-        <property name="fillTime" type="date">
-            <column name="fill_time" length="10" />
-        </property>
-        <property name="isCancel" type="string">
-            <column name="is_cancel" length="10" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark" length="255" />
-        </property>
-        <property name="userName" type="string">
-            <column name="user_name" length="10" />
-        </property>
-        
-      <property name="firstQuarterAdjust" type="java.lang.Float">
-            <column name="first_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="secondQuarterAdjust" type="java.lang.Float">
-            <column name="second_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="thirdQuarterAdjust" type="java.lang.Float">
-            <column name="third_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="fourthQuarterAdjust" type="java.lang.Float">
-            <column name="fourth_quarter_adjust" precision="8" scale="0" />
-        </property>
-        
-         <property name="fileNo" type="string">
-            <column name="file_no" length="100" />
-        </property>       
-         <property name="contacts" type="string">
-            <column name="contacts" length="100" />
-        </property>    
-         <property name="contactNo" type="string">
-            <column name="contact_no" length="100" />
-        </property>            
- 		<!-- 新增栏计划用水量，就是增加30%前的计划用水量 -->
-         <property name="replyOfIncrease" type="java.lang.Float">
-            <column name="reply_of_increase" precision="8" scale="0" />
-        </property>
-        <!-- 新增栏计划用水量，就是增加30%前的计划用水量 -->        
-		<one-to-one name="org" class="com.bus.model.BusOrg" constrained="true"/>
-<!-- 		<set name="busQuarterlyAssessment" cascade="all-delete-orphan" inverse="true">  -->
-<!-- 			<key column="plan_id"/> -->
-<!-- 			<one-to-many class="com.bus.model.BusQuarterlyAssessment" /> -->
-<!-- 		</set> -->
-		<many-to-one name="baseStatus" class="com.base.model.BaseStatus" not-null="false">
-            <column name="status_id"/>
-        </many-to-one>
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusCustomerMeter.hbm.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusCustomerMeter" table="bus_customer_meter">
-        <id name="meterId" type="long">
-            <column name="meter_id" />
-            <generator class="native" />
-        </id>
-        <property name="year" type="string">
-            <column name="year" length="10" />
-        </property>
-        <property name="meterSpec" type="string">
-            <column name="meter_spec" length="10" />
-        </property>
-        <property name="meterType" type="string">
-            <column name="meter_type" length="10" />
-        </property>
-        <property name="address" type="string">
-            <column name="address" length="100" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark" length="100" />
-        </property>
-		<many-to-one name="org" class="com.bus.model.BusOrg" not-null="false"> 
-			<column name="org_id"/>
-		</many-to-one>
-		<property name="customerNumber" column="customer_Number" />
-		<property name="meterNumber" column="meter_Number" />
-		<property name="changeReason" column="change_reason" />
-		<property name="changeTime" column="change_time" />
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusMeterReadInfo.hbm.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusMeterReadInfo" table="bus_meter_read_info">
-        <id name="infoId" type="long">
-            <column name="info_id"/>
-            <generator class="native" />
-        </id>
-        <property name="priceMonth">
-            <column name="price_month"  />
-        </property>
-        <property name="water">
-            <column name="water"/>
-        </property>
-        <property name="baseWaterPrice" >
-            <column name="base_water_price"  />
-        </property>
-        <property name="sewagePrice" >
-            <column name="sewage_price"  />
-        </property>
-        <property name="importStatus">
-           <column name="import_status"></column>
-        </property>
-<!-- 		<many-to-one name="busMeter" class="com.bus.model.BusMeter" not-null="false">  -->
-<!-- 			<column name="meter_id"/>  -->
-<!-- 		</many-to-one> -->
-		<many-to-one name="baseWaterProperties" class="com.base.model.BaseWaterProperties" not-null="false"> 
-			<column name="properties_id"/> 
-		</many-to-one>
-		<many-to-one name="org" class="com.bus.model.BusOrg" not-null="false"> 
-			<column name="org_id"/>
-		</many-to-one>
-		<property name="orgNumber" column="org_number" />
-		<property name="year" column="year" />
-		<property name="meterNumber" column="meter_number" />
-		<property name="month" column="month" />
-		<property name="quarter" column="quarter" />
-		<property name="importId" column="import_id" />
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusOrg.hbm.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-	<class name="com.bus.model.BusOrg" table="bus_org">
-		<id name="orgId" type="long">
-			<column name="org_id" />
-			<generator class="native" />
-		</id>
-		<property name="orgName">
-			<column name="org_name" />
-		</property>
-		<property name="orgNumber">
-			<column name="org_number" />
-		</property>
-		<property name="address">
-			<column name="address" />
-		</property>
-		<property name="isPlanUser">
-			<column name="is_plan_user" />
-		</property>
-		<property name="year">
-			<column name="year" />
-		</property>
-		<property name="industryNumber">
-			<column name="industry_number" />
-		</property>
-		<property name="code">
-			<column name="code" />
-		</property>
-		<property name="email">
-			<column name="email" />
-		</property>
-		<property name="bank">
-			<column name="bank" />
-		</property>
-		<property name="bankAccount">
-			<column name="bank_account" />
-		</property>
-		<property name="remark">
-			<column name="remark" />
-		</property>
-		<property name="isReply">
-			<column name="is_reply" />
-		</property>
-		<property name="postalAddress">
-			<column name="postal_address" />
-		</property> 
-		<property name="newMeter">
-			<column name="newMeter" />
-		</property> 
-<!-- 		<set name="customers" cascade="all-delete-orphan" inverse="true"> -->
-<!-- 			<key column="org_id" /> -->
-<!-- 			<one-to-many class="com.bus.model.BusCustomer" /> -->
-<!-- 		</set> -->
-		<set name="busCustomerMeters" cascade="all-delete-orphan" inverse="true">
-			<key column="org_id" />
-			<one-to-many class="com.bus.model.BusCustomerMeter" />
-		</set>
-		<many-to-one name="orgType" class="com.base.model.BaseOrgType"
-			not-null="false">
-			<column name="org_type_id" />
-		</many-to-one>
-<!-- 		<many-to-one name="baseUserType" class="com.base.model.BaseUserType" not-null="false"> -->
-<!-- 		   <column name="userTypeId"/> -->
-<!-- 		</many-to-one> -->
-		<property name="baseUserType" column="user_type" />
-		<property name="importId" column="import_id" />
-	    <one-to-one name="busAnnualPlanForWater" cascade="delete" class="com.bus.model.BusAnnualPlanForWater"/>
-		<set name="readinfos" cascade="all-delete-orphan" inverse="true">
-			<key column="org_id" />
-			<one-to-many class="com.bus.model.BusMeterReadInfo" />
-		</set>
-		<property name="area" column="area" />
-		<property name="phone" column="phone" />
-		<property name="importStatus" column="import_status" />
-		<property name="linkman" column="linkman" />
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusOrgWx.hbm.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusOrgWx" table="bus_org_wx">        
-		<id name="Id" type="long">
-			<column name="id" />
-			<generator class="native" />
-		</id>
-  		<property name="orgNumber">
-			<column name="org_number" />
-		</property>		      
-
-        <property name="createTime" type="date">
-            <column name="create_time" length="10" />
-        </property>
-        <property name="openId" type="string">
-            <column name="OpenId" length="10" />
-        </property> 
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusQuarterlyAssessment.hbm.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusQuarterlyAssessment" table="bus_quarterly_assessment">
-        <id name="assessmentId" type="long">
-            <column name="assessment_id" />
-            <generator class="native" />
-        </id>
-        <property name="assessmentQuarter" type="java.lang.Integer">
-            <column name="assessment_quarter" />
-        </property>
-        <property name="waterPrice" type="java.lang.Float">
-            <column name="water_price" precision="8" scale="0" />
-        </property>
-        <property name="waterType" type="string">
-            <column name="water_type" length="10" />
-        </property>
-        <property name="actualClosingWater" type="java.lang.Float">
-            <column name="actual_closing_water" precision="8" scale="0" />
-        </property>
-        <property name="waterPlanningIndex" type="java.lang.Float">
-            <column name="water_planning_index" precision="8" scale="0" />
-        </property>
-        <property name="actualUseWater" type="java.lang.Float">
-            <column name="actual_use_water" precision="8" scale="0" />
-        </property>
-		<many-to-one name="org" class="com.bus.model.BusOrg" not-null="false"> 
-			<column name="org_id"/> 
-		</many-to-one>
-		<property name="amountReceivable" type="java.lang.Float">
-            <column name="amount_receivable" precision="8" scale="0" />
-        </property>
-        <property name="isWriteOff" type="string">
-            <column name="is_write_off" length="10" />
-        </property>
-        <property name="modeOfPayment" type="string">
-            <column name="mode_of_payment" length="10" />
-        </property>
-        <property name="bank" type="string">
-            <column name="bank" length="10" />
-        </property>
-        <property name="bankAccount" type="string">
-            <column name="bank_account" length="10" />
-        </property>
-        <property name="writeOffDate" type="date">
-            <column name="write_off_date" length="10" />
-        </property>
-        <property name="paidInAmount" type="java.lang.Float">
-            <column name="paid_in_amount" precision="8" scale="2" />
-        </property>
-        <property name="remark" type="string">
-            <column name="remark" length="10" />
-        </property>
-        <property name="incomeWaterPrice" type="java.lang.Float">
-            <column name="income_water_price" precision="8" scale="0" />
-        </property>
-        <property name="replyOfWater" type="java.lang.Float">
-            <column name="reply_of_water" precision="8" scale="0" />
-        </property>
-        <property name="invoiceNo" type="string">
-            <column name="invoice_no" length="50" />
-        </property>
-         <property name="taxPay" type="java.lang.Integer">
-            <column name="tax_pay" length="1" />
-        </property>       
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/BusWaterAdjRec.hbm.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-    <class name="com.bus.model.BusWaterAdjRec" table="water_adj_rec">
-       	<id name="id" type="long">
-			<column name="id" />
-			<generator class="native" />
-		</id>
-       
-        <property name="orgId" type="long">
-           <column name="org_id"/>
-        </property>
- 
-        
-      <property name="firstQuarterAdjust" type="java.lang.Float">
-            <column name="first_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="secondQuarterAdjust" type="java.lang.Float">
-            <column name="second_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="thirdQuarterAdjust" type="java.lang.Float">
-            <column name="third_quarter_adjust" precision="8" scale="0" />
-        </property>
-        <property name="fourthQuarterAdjust" type="java.lang.Float">
-            <column name="fourth_quarter_adjust" precision="8" scale="0" />
-        </property>
-        
-         <property name="fillTime" type="date">
-            <column name="fill_time" length="20" />
-        </property>       
-         <property name="fillUser" type="string">
-            <column name="fill_user" length="20" />
-        </property>    
-          
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/bus/model/Yhjbxx.hbm.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2014-10-25 18:34:16 by Hibernate Tools 4.0.0 -->
-<hibernate-mapping>
-	<class name="com.bus.model.Yhjbxx" table="yhjbxx">
-		<id name="id" type="long">
-			<column name="id" />
-			<generator class="native" />
-		</id>
-		<property name="Khh">
-			<column name="KHH" />
-		</property>
-		<property name="Hh">
-			<column name="HH" />
-		</property>
-		<property name="Bzmc">
-			<column name="BZMC" />
-		</property>
-		<property name="Zbwz">
-			<column name="ZBWZ" />
-		</property>
-		<property name="Yyqy">
-			<column name="YYQY" />
-		</property>
-		<property name="Lxdh">
-			<column name="LXDH" />
-		</property>
-		<property name="Zh">
-			<column name="ZH" />
-		</property>
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/data/model/ImportDataFile.hbm.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.data.model.ImportDataFile" table="import_data_file">
-		<id name="importId" type="long">
-			<column name="import_id" />
-			<generator class="native" />
-		</id>
-        <property name="fileName" column="file_name" />
-        <property name="filePath" column="file_path" />
-        <property name="fileSize" column="file_size" />
-        <property name="importType" column="import_type" />
-        <property name="uploadTime" column="upload_time" />
-        <property name="year" column="year" />
-        <property name="dataStatus" column="data_status" />
-        <property name="statusDescription" column="status_description" />
-        <property name="createTime" column="create_time" />
-        <many-to-one name="creater" class="com.popedom.model.PopUser" not-null="false"> 
-			<column name="userId"/> 
-		</many-to-one>
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/PopOrg.hbm.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2008-3-13 15:29:52 by Hibernate Tools 3.2.0.b9 -->
-<hibernate-mapping>
-	<class name="com.popedom.model.PopOrg" table="pop_org">
-		<id name="orgId" type="long">
-			<column name="orgId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="orgName" />
-		<property name="orgCode" />
-		<property name="orgDesc" />
-		<property name="orgType" />
-		<property name="state" />
-		<property name="lft" />
-		<property name="rgt" />
-		<property name="createTime" />
-		<property name="updateTime" />
-		<property name="processState" />
-		<property name="processInstanceId" />
-		
-		<many-to-one name="parent" class="com.popedom.model.PopOrg" not-null="false"> 
-			<column name="parentId"/> 
-		</many-to-one>
-		
-		
-		<set name="users" cascade="delete-orphan" inverse="true"> 
-			<key column="orgId"/>
-			<one-to-many class="com.popedom.model.PopUserOrg" />
-		</set>
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/PopResource.hbm.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2008-3-13 15:29:52 by Hibernate Tools 3.2.0.b9 -->
-<hibernate-mapping>
-	<class name="com.popedom.model.PopResource" table="pop_resource">
-		<id name="resourceId" type="long">
-			<column name="resourceId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="resourceName" />
-		<property name="resourceEcode" />
-		<property name="urlPath" />
-		<property name="resourceDesc" />
-		<property name="icon" />
-		<property name="state" />
-		<property name="sort" />
-		<property name="etype" />
-		<property name="mode" />
-		
-		<property name="lft" />
-		<property name="rgt" />
-		
-		<many-to-one name="parent" class="com.popedom.model.PopResource" not-null="false"> 
-			<column name="parentId"/> 
-		</many-to-one>
-		
-		<set name="roles" table="pop_role_res">
-			<key column="resourceId"/>
-			<many-to-many column="roleId" class="com.popedom.model.PopRole"/>
-		</set>
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/PopRole.hbm.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2008-3-13 15:29:52 by Hibernate Tools 3.2.0.b9 -->
-<hibernate-mapping>
-	<class name="com.popedom.model.PopRole" table="pop_role">
-		<id name="roleId" type="long">
-			<column name="roleId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="roleName" />
-		<property name="roleDesc" />
-		<property name="state" />
-		<property name="createTime" />
-		<property name="updateTime" />
-		
-		<set name="users" table="pop_user_role">
-			<key column="roleId"/>
-			<many-to-many column="userId" class="com.popedom.model.PopUser"/>
-		</set>
-		
-		<set name="resources" table="pop_role_res" lazy="false">
-			<key column="roleId"/>
-			<many-to-many column="resourceId" class="com.popedom.model.PopResource"/>
-		</set>
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/PopUser.hbm.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-	<class name="com.popedom.model.PopUser" table="pop_user">
-		<id name="userId" type="long">
-			<column name="userId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="userName" />
-		
-		<property name="fullName" />
-		
-		<property name="password" />
-		
-		<property name="phone" />
-		
-		<property name="email" />
-		
-		<property name="state" />
-		
-		<property name="remark" />
-		
-		<property name="lastLoginTime" />
-		
-		<property name="sex" />
-		
-		<set name="roles" table="pop_user_role">
-			<key column="userId"/>
-			<many-to-many column="roleId" class="com.popedom.model.PopRole"/>
-		</set>
-		
-		<set name="orgs" cascade="all-delete-orphan" inverse="true"> 
-			<key column="userId"/>
-			<one-to-many class="com.popedom.model.PopUserOrg" />
-		</set>
-		
-		<property name="createTime" />
-		<property name="updateTime" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/PopUserOrg.hbm.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2008-3-13 15:29:52 by Hibernate Tools 3.2.0.b9 -->
-<hibernate-mapping>
-	<class name="com.popedom.model.PopUserOrg" table="pop_user_org">
-		<id name="userOrgId" type="long">
-			<column name="userOrgId" />
-			<generator class="native" />
-		</id>
-		
-		<many-to-one name="popUser" class="com.popedom.model.PopUser" not-null="false"> 
-			<column name="userId"/> 
-		</many-to-one>
-		
-		<many-to-one name="popOrg" class="com.popedom.model.PopOrg" not-null="false" lazy="false"> 
-			<column name="orgId"/> 
-		</many-to-one>
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/popedom/model/WxOrg.hbm.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 2008-3-13 15:29:52 by Hibernate Tools 3.2.0.b9 -->
-<hibernate-mapping>
-	<class name="com.popedom.model.WxOrg" table="Wx_org">
-		<id name="wmId" type="long">
-			<column name="wmId" />
-			<generator class="native" />
-		</id>
-		
-		<property name="orgNumber" />
-		<property name="openId" />
-		<property name="inUse" />
-		
-	</class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/water/model/WaterApproved.hbm.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2016-7-26 11:26:10 by Hibernate Tools 5.1.0.Alpha1 -->
-<hibernate-mapping>
-    <class name="com.water.model.WaterApproved" table="water_approved" catalog="gxwss" optimistic-lock="version">
-        
-        <id name="approvedId" type="java.lang.Long">
-            <column name="approved_id" />
-            <generator class="identity" />
-        </id>
-        
-       <property name="checkId" type="java.lang.Long">
-            <column name="check_id" length="100" />
-        </property>
-        
-        <property name="quotaId" type="java.lang.Long">
-            <column name="quota_id" length="100" />
-        </property>
-        
-        <property name="amount" type="java.lang.Float">
-            <column name="amount" precision="12" scale="0" />
-        </property>
-
-        <property name="num" type="java.lang.Float">
-            <column name="num"  precision="12" scale="0" />
-        </property>
-        
-        <property name="total" type="java.lang.Float">
-            <column name="total"  precision="12" scale="0" />
-        </property>
-        <property name="unit0" type="string">
-            <column name="unit_0" length="100" />
-        </property>
-        <property name="unit" type="string">
-            <column name="unit" length="100" />
-        </property>
-        <property name="unitValue" type="java.lang.Float">
-            <column name="unit_value" precision="12" scale="0" />
-        </property>
-
-        <property name="timing" type="string">
-            <column name="timing" length="20" />
-        </property>
-        <property name="descName" type="string">
-            <column name="desc_name" length="500" />
-        </property>       		
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/water/model/WaterCheck.hbm.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2016-7-26 11:26:10 by Hibernate Tools 5.1.0.Alpha1 -->
-<hibernate-mapping>
-    <class  name="com.water.model.WaterCheck" table="water_check" catalog="gxwss" optimistic-lock="version">
-        <id name="checkId" type="java.lang.Long">
-            <column name="check_id" />
-            <generator class="identity" />
-        </id>
-        <property name="orgId" type="java.lang.Long">
-            <column name="org_id" />
-        </property>
-        <property name="processInstanceId" type="string">
-            <column name="processInstanceId" />
-        </property>
-        <property name="status" type="java.lang.Integer">
-            <column name="status" />
-        </property>
-        <property name="createTime" type="date">
-            <column name="create_time" length="10" />
-        </property>
-        
-         <property name="increase" type="java.lang.Float">
-            <column name="increase" />
-        </property>        
-         <property name="plan" type="java.lang.Float">
-            <column name="plan" />
-        </property>
-         <property name="total" type="java.lang.Float">
-            <column name="total" />
-        </property>
-
-         <property name="trueUp" type="java.lang.Float">
-            <column name="true_up" />
-        </property>
-        
-          <property name="true1" type="java.lang.Float">
-            <column name="true_1" />
-        </property>   
-        
-         <property name="true2" type="java.lang.Float">
-            <column name="true_2" />
-        </property>
-
-         <property name="true3" type="java.lang.Float">
-            <column name="true_3" />
-        </property>
- 
-          <property name="true4" type="java.lang.Float">
-            <column name="true_4" />
-        </property>
-                                           
-          <property name="inputUser" type="string">
-            <column name="input_user" />
-        </property>            
-        
-          <property name="content" type="string">
-            <column name="content" />
-        </property>  
-        
-         <property name="planId" type="string">
-            <column name="plan_id" />
-        </property>         
-         <property name="checkInfo" type="string">
-            <column name="check_info" />
-        </property>        
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/water/model/WaterCheckRec.hbm.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2016-7-26 11:26:10 by Hibernate Tools 5.1.0.Alpha1 -->
-<hibernate-mapping>
-    <class name="com.water.model.WaterCheckRec" table="water_check_rec" catalog="gxwss" optimistic-lock="version">
-        <id name="recId" type="java.lang.Long">
-            <column name="rec_id" />
-            <generator class="identity" />
-        </id> 
-        <property name="checkId" type="java.lang.Long">
-            <column name="check_id"  />
-        </property>      
-       <property name="advice" type="string">
-            <column name="advice" length="500" />
-        </property>
-        <property name="inputUser" type="string">
-            <column name="input_user" length="20" />
-        </property>
-        <property name="roleUser" type="string">
-            <column name="role_user" length="20" />
-        </property>        
-        <property name="checkTime" >
-            <column name="check_time"  />
-        </property>		
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/com/water/model/WaterQuota.hbm.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated 2016-7-26 11:26:10 by Hibernate Tools 5.1.0.Alpha1 -->
-<hibernate-mapping>
-    <class name="com.water.model.WaterQuota" table="water_quota" catalog="gxwss" optimistic-lock="version">
-        <id name="quotaId" type="java.lang.Long">
-            <column name="quota_id" />
-            <generator class="identity" />
-        </id>
-       <property name="unit0" type="string">
-            <column name="unit_0" length="100" />
-        </property>
-        <property name="unit" type="string">
-            <column name="unit" length="100" />
-        </property>
-        <property name="unitValue" type="java.lang.Float">
-            <column name="unit_value" precision="12" scale="0" />
-        </property>
-
-        <property name="timing" type="string">
-            <column name="timing" length="20" />
-        </property>
-        <property name="descName" type="string">
-            <column name="desc_name" length="500" />
-        </property>
-         <property name="parName" type="string">
-            <column name="par_name" length="500" />
-        </property>       
-        		
-		<many-to-one name="parent" class="com.water.model.WaterQuota" not-null="false"> 
-			<column name="parent_id"/> 
-		</many-to-one>
-		
-    </class>
-</hibernate-mapping>

WebContent/WEB-INF/classes/config.properties

@@ -1 +0,0 @@
-upload_mdb=d:\\gxwss\\upload\\

WebContent/WEB-INF/classes/db.properties

@@ -1,14 +0,0 @@
-jdbc.driverClassName=sun.jdbc.odbc.JdbcOdbcDriver
-jdbc.url=jdbc\:odbc\:driver\={Microsoft Access Driver (*.mdb)};DBQ\=d\:\\gxwss\\test.mdb;charSet\=GBK
-jdbc.username=
-jdbc.password=
-jdbc.encoding=GBK
-
-
-db.alias=dbpool
-db.simultaneousBuildThrottle=20
-db.maximumActiveTime = 3600000
-db.houseKeepingTestSql=select 1 from dual
-db.characterEncoding=UTF-8
-db.maximumConnectionCount=200
-db.minimumConnectionCount=30

WebContent/WEB-INF/classes/hibernate.reveng.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-reverse-engineering PUBLIC "-//Hibernate/Hibernate Reverse Engineering DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-reverse-engineering-3.0.dtd" >
-
-<hibernate-reverse-engineering>
-  <table-filter match-catalog="test_gxwss" match-name="base_section"/>
-</hibernate-reverse-engineering>

WebContent/WEB-INF/classes/jdbc.properties

@@ -1,26 +0,0 @@
-jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/gxwss?useUnicode=true&characterEncoding=utf-8
-
-jdbc.url.mysql=jdbc:mysql://localhost:3306/gxwss?user=root&password=root&useUnicode=true&characterEncoding=utf-8
-
-#jdbc.url=jdbc:mysql://localhost:3306/gxaah_test05?useUnicode=true&characterEncoding=utf-8
-hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-#hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
-jdbc.username=root
-jdbc.password=root
-
-
-oracledriver=oracle.jdbc.OracleDriver
-oracleurl=jdbc:oracle:thin:@192.168.0.31:1521:orcl
-oracleuser=SEARCH
-oraclepwd=96332
-
-
-db.alias=dbpool
-db.simultaneousBuildThrottle=20
-db.maximumActiveTime = 31536000
-db.houseKeepingTestSql=select 1 from dual
-db.characterEncoding=UTF-8
-db.maximumConnectionCount=500
-db.minimumConnectionCount=30
-

WebContent/WEB-INF/classes/logback.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->  
-    <property name="LOG_HOME" value="d:/logs" />  
-
-	 <!-- 控制台输出 -->
-	 <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-       <!-- 日志输出编码 -->  
-       <Encoding>UTF-8</Encoding>   
-        <layout class="ch.qos.logback.classic.PatternLayout">   
-             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符--> 
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{80} - %msg%n   
-            </pattern>   
-        </layout>   
-    </appender> 
-	
-	<!-- 按照每天生成日志文件 -->   
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">   
-        <Encoding>UTF-8</Encoding>   
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/gxwss.log.%d{yyyy-MM-dd}.log</FileNamePattern>   
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>   
-        <layout class="ch.qos.logback.classic.PatternLayout">  
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符--> 
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}  %-5level %logger{80} - %msg%n   
-            </pattern>   
-       </layout> 
-        <!--日志文件最大的大小-->
-       <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-         <MaxFileSize>10MB</MaxFileSize>
-       </triggeringPolicy>
-    </appender> 
-
-
-
-	<!-- 日志输出级别 -->
-    <root level="ERROR">   
-        <appender-ref ref="STDOUT" />   
-        <appender-ref ref="FILE" />   
-    </root>
-    
-</configuration>
-

WebContent/WEB-INF/classes/quartz-task.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
-	default-lazy-init="false">
-	<!-- 调度器 -->
-    <bean name="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> 
-       <!-- 通过applicationContextSchedulerContextKey属性配置spring上下文 -->    
-        <property name="applicationContextSchedulerContextKey">    
-            <value>applicationContext</value>    
-        </property>   
-    </bean>  
-    <!--加载数据库任务-->
-    <bean id="loadTask" class="com.data.dao.impl.Quartz" init-method="loadTask" />
-</beans>

WebContent/WEB-INF/classes/spring-activiti.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context" 
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	   xmlns:jee="http://www.springframework.org/schema/jee" 
-	   xmlns:tx="http://www.springframework.org/schema/tx" 
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd      
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
-	default-lazy-init="true">
-	
-	
-	<bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
-		<property name="dataSource" ref="dataSource" />
-		<property name="transactionManager" ref="txManager" />
-		<property name="databaseSchemaUpdate" value="true" />
-		<property name="jobExecutorActivate" value="false" />
-		<property name="dbIdentityUsed" value="false" />
-		<property name="history" value="full" />
-	</bean>
-
-	<bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean">
-		<property name="processEngineConfiguration" ref="processEngineConfiguration" />
-	</bean>
-
-	<bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService"/>
-	<bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService"/>
-	<bean id="formService" factory-bean="processEngine" factory-method="getFormService"/>
-	<bean id="identityService" factory-bean="processEngine" factory-method="getIdentityService"/>
-	<bean id="taskService" factory-bean="processEngine" factory-method="getTaskService" />
-	<bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService"/>
-	<bean id="managementService" factory-bean="processEngine" factory-method="getManagementService"/>
-	
-</beans>

WebContent/WEB-INF/classes/spring-context.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context" 
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	   xmlns:jee="http://www.springframework.org/schema/jee" 
-	   xmlns:tx="http://www.springframework.org/schema/tx" 
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd      
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
-	>
-	
-	
-	<context:annotation-config/>
-		<!-- spring上下文,可以获取 上下文的Context -->
-    <bean id="appUtil" class="com.core.util.AppUtil" />
-    
-	<import resource="spring-resources.xml"/>
-	<import resource="spring-dao.xml"/> 
-	<import resource="spring-service.xml"/> 
-	<import resource="spring-security.xml"/> 
-	<import resource="spring-activiti.xml"/>	
-
-</beans>

WebContent/WEB-INF/classes/spring-dao.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-lazy-init="true" xsi:schemaLocation="   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd   http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd         http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-	<!--用户信息 -->
-	<bean class="com.popedom.dao.impl.PopUserDaoImpl" id="popUserDao"/>
-	<!--角色信息 -->
-	<bean class="com.popedom.dao.impl.PopRoleDaoImpl" id="popRoleDao"/>
-	<!--组织机构信息 -->
-	<bean class="com.popedom.dao.impl.PopOrgDaoImpl" id="popOrgDao"/>
-	<!--用户部门信息 -->
-	<bean class="com.popedom.dao.impl.PopUserOrgDaoImpl" id="popUserOrgDao"/>
-	
-	<!--微信 -->
-	<bean class="com.popedom.dao.impl.WxOrgDaoImpl" id="WxOrgDao"/>
-
-	<!--系统资源信息 -->
-	<bean class="com.popedom.dao.impl.PopResourceDaoImpl" id="popResourceDao"/>
-	<!--表单流程关联信息-->
-	<bean id="bpmFormProcessDao" class="com.bpm.dao.impl.BpmFormProcessDaoImpl"/>
-	<!--流程结点人员设置信息-->
-	<bean id="bpmNodeUserDao" class="com.bpm.dao.impl.BpmNodeUserDaoImpl"/>
-	<!--流程实例信息-->
-	<bean id="bpmProcessRunDao" class="com.bpm.dao.impl.BpmProcessRunDaoImpl"/>
-	<!--任务审批意见信息-->
-	<bean id="bpmTaskOpinionDao" class="com.bpm.dao.impl.BpmTaskOpinionDaoImpl"/>
-	<!-- 数据导入模块 -->
-
-	<!-- 数据导入文件 -->
-	<bean class="com.data.dao.impl.ImportDataFileDaoImpl" id="importFileDataDao"/>
-
-	<!-- 业务模块 -->
-
-	<!-- 单位基本信息 -->
-	<bean class="com.bus.dao.impl.BusOrgDaoImpl" id="busOrgDao"/>
-
-	<bean class="com.base.dao.impl.BaseOrgTypeDaoImpl" id="baseOrgTypeDao"/>
-	<bean class="com.base.dao.impl.BasePunishmentSectionDaoImpl" id="basePunishmentSectionDao"/>
-	<bean class="com.base.dao.impl.BaseSectionDaoImpl" id="baseSectionDao"/>
-	<bean class="com.base.dao.impl.BaseSystemParamDaoImpl" id="baseSystemParamDao"/>
-	<bean class="com.base.dao.impl.BaseUserTypeDaoImpl" id="baseUserTypeDao"/>
-	<bean class="com.base.dao.impl.BaseWaterPropertiesDaoImpl" id="baseWaterPropertiesDao"/>
-	<bean class="com.base.dao.impl.BaseStatusDaoImpl" id="baseStatusDao"/>
-	
-	<bean class="com.bus.dao.impl.BusAnnualPlanForWaterDaoImpl" id="busAnnualPlanForWaterDao"/>
-	<bean class="com.bus.dao.impl.BusMeterReadInfoDaoImpl" id="busMeterReadInfoDao"/>
-	<bean class="com.bus.dao.impl.BusQuarterlyAssessmentDaoImpl" id="busQuarterlyAssessmentDao"/>
-	<bean class="com.bus.dao.impl.BusCustomerMeterDaoImpl" id="busCustomerMeterDao"/>
-
-	<!-- 临时用水指标修改记录,用水指标审核 -->
-	<bean class="com.bus.dao.impl.BusWaterAdjRecDaoImpl" id="waterAdjRecDao"/>
-	<bean class="com.water.dao.impl.WaterCheckDaoImpl" id="waterCheckDao"/>
-	<bean class="com.water.dao.impl.WaterQuotaDaoImpl" id="waterQuotaDao"/>	
-	
-	<bean class="com.water.dao.impl.WaterApprovedDaoImpl" id="waterApprovedDao"/>
-	<bean class="com.water.dao.impl.WaterCheckRecDaoImpl" id="waterCheckRecDao"/>		
-</beans>

WebContent/WEB-INF/classes/spring-directive.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context" 
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	   xmlns:jee="http://www.springframework.org/schema/jee" 
-	   xmlns:tx="http://www.springframework.org/schema/tx" 
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xmlns:mvc="http://www.springframework.org/schema/mvc"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd      
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd"
-	   	default-lazy-init="true">
-		
-		<!--后台权限标签-->
-		<bean id="pop_perm" class="com.popedom.web.directive.PermistionDirective"/>
-		<bean id="enum_show" class="com.core.util.EnumValueShow" />
-</beans> 

WebContent/WEB-INF/classes/spring-mvc.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context" 
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	   xmlns:jee="http://www.springframework.org/schema/jee" 
-	   xmlns:tx="http://www.springframework.org/schema/tx" 
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xmlns:mvc="http://www.springframework.org/schema/mvc"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd      
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd"
-	   	default-lazy-init="true">
-		
-		<!-- SpringMVC相关Bean配置 -->
-		<context:component-scan base-package="com.*.web" />
-		<context:annotation-config/>
-		<!--可以完成日期自动转换功能-->
-		<mvc:annotation-driven>
-		    <!-- SpringMVC下载器 -->
-			<mvc:message-converters>  
-		        <bean class="com.core.util.file.DownloadHttpMessageConverter" />
-		    </mvc:message-converters> 
-		</mvc:annotation-driven>  
-		
-		<!-- 使用注解映射 -->
-		<bean id="handlerMapping" class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/>
-		
-		<!-- 启动Spring MVC的注解功能，完成请求和注解POJO的映射 -->
-		<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" >
-			<property name="messageConverters">
-				<list>
-					<ref bean="stringHttpMessageConverter"/>
-					<ref bean="mappingJacksonHttpMessageConverter"/>
-				</list>
-			</property>
-		</bean>
-		
-		<bean id="stringHttpMessageConverter" class="org.springframework.http.converter.StringHttpMessageConverter">
-				<property name="supportedMediaTypes">  
-                   <list>  
-                       <value>text/plain;charset=UTF-8</value>  
-                    </list>  
-               </property>  
-		</bean>
-		
-		<!-- 让controller 返回json的配置 -->
-		<bean id="mappingJacksonHttpMessageConverter" class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
-			<property name="supportedMediaTypes">
-				<list>
-					<value>text/html;charset=UTF-8</value>
-				</list>
-			</property>
-		</bean>
-		
-	<!-- 对模型视图名称的解析，即在模型视图名称添加前后缀
-	<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="redirectHttp10Compatible" value="false"/>
-		<property name="viewClass" value="org.springframework.web.servlet.view.JstlView" />
-		<property name="contentType" value="text/html;charset=UTF-8" />
-		<property name="prefix" value="/WEB-INF/view/" />
-		<property name="suffix" value=".jsp" />
-	</bean>
-	 -->
-	<!-- FreeMarker视图解析 ,在这里配置后缀名ftl和视图解析器。。-->
-	<bean id="freemarkerViewResolver" class="com.core.web.springmvc.RichFreeMarkerViewResolver">
-		<property name="prefix" value="/view/"/>
-		<property name="suffix" value=".jsp"/>
-		<property name="contentType" value="text/html; charset=UTF-8"/>
-		<property name="exposeRequestAttributes" value="false"/>
-		<property name="exposeSessionAttributes" value="false"/>
-		<property name="exposeSpringMacroHelpers" value="true"/>
-		
-		<!-- <property name="attributesMap">
-			<map>
-				<entry key="enum_show">
-					<bean class="com.core.util.EnumValueShow"></bean>
-				</entry>
-			</map>
-		</property> -->
-	</bean>
-	 <!-- freemarker的配置 -->
-	<bean id="freemarkerConfig" class="org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer">
-		<property name="templateLoaderPath" value="/WEB-INF"/>
-		<property name="freemarkerVariables">
-			<map>
-				<!--后台管理权限控制-->
-				<entry key="pop_perm" value-ref="pop_perm"/>
-				<entry key="enum_show" value-ref="enum_show" />
-			</map>
-		</property>
-		<property name="freemarkerSettings">
-			<props>
-				<prop key="template_update_delay">0</prop>
-				<prop key="defaultEncoding">UTF-8</prop>
-				<prop key="url_escaping_charset">UTF-8</prop>
-				<prop key="locale">zh_CN</prop>
-				<prop key="boolean_format">true,false</prop>
-				<prop key="datetime_format">yyyy-MM-dd HH:mm:ss</prop>
-				<prop key="date_format">yyyy-MM-dd</prop>
-				<prop key="time_format">HH:mm:ss</prop>
-				<prop key="number_format">0.######</prop>
-				<prop key="whitespace_stripping">true</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<!-- 让springmvc支持文件上传 -->
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-    	<property name="maxInMemorySize" value="2048"></property>
-    	<property name="maxUploadSize" value="1000000000"/>
-    	<property name="uploadTempDir" value="tmoDir"></property>
-    </bean>
-	
-	<!--把标签定义包含进来-->
-	<import resource="spring-directive.xml"/> 
-	
-</beans> 

WebContent/WEB-INF/classes/spring-resources.xml

@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context" 
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	   xmlns:jee="http://www.springframework.org/schema/jee" 
-	   xmlns:tx="http://www.springframework.org/schema/tx" 
-	   xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd      
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
-	default-lazy-init="false">
-	
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>classpath:jdbc.properties</value>
-			</list>
-		</property>
-	</bean>
-	
-	<bean id="dataSource" class="org.logicalcobwebs.proxool.ProxoolDataSource">  
-		<property name="driver" value="${jdbc.driverClassName}"/>
-		<property name="driverUrl" value="${jdbc.url}"/>
-		<property name="user" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-		
-		<property name="alias" value="${db.alias}"/>
-		<property name="simultaneousBuildThrottle" value="${db.simultaneousBuildThrottle}"/>
-		<property name="maximumActiveTime" value="${db.maximumActiveTime}"/>
-		<property name="houseKeepingTestSql" value="${db.houseKeepingTestSql}"/>
-		<property name="maximumConnectionCount" value="${db.maximumConnectionCount}"/>
-		<property name="minimumConnectionCount" value="${db.minimumConnectionCount}"/>
-		<property name="delegateProperties" value="characterEncoding=${db.characterEncoding}"/>
-	</bean>
-	
-	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="mappingLocations">
-			<list>
-				<value>classpath:com/popedom/model/*.hbm.xml</value>
-				<value>classpath:com/data/model/*.hbm.xml</value>
-				<value>classpath:com/bus/model/*.hbm.xml</value>
-				<value>classpath:com/base/model/*.hbm.xml</value>
-				<value>classpath:com/bpm/model/*.hbm.xml</value>	
-				<value>classpath:com/water/model/*.hbm.xml</value>			
-			</list>
-		</property>
-		<property name="hibernateProperties">
-			<props>
-				<prop key="connection.useUnicode">true</prop>
-				<prop key="connection.characterEncoding">utf-8</prop>
-				<prop key="hibernate.dialect">${hibernate.dialect}</prop>
-				<prop key="hibernate.show_sql">true</prop>
-				<prop key="hibernate.jdbc.batch_size">20</prop>
-				<prop key="hibernate.jdbc.fetch_size">20</prop>
-				<prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
-				<prop key="net.sf.ehcache.configurationResourceName">conf/ehcache.xml</prop>
-				<prop key="hibernate.cache.use_second_level_cache">false</prop>
-				<prop key="hibernate.hbm2ddl.auto">update</prop> 	
-				<prop key="connection.autoReconnect">true</prop> 
-		        <prop key="connection.autoReconnectForPools">true</prop> 
-		        <prop key="connection.is-connection-validation-required">true</prop> 
-			</props>
-		</property>
-		<property name="entityInterceptor">   
-			<ref local="treeInterceptor"/>
-		</property>
-	</bean>
-	
-	<!-- 开启注解事务 只对当前配置文件有效 -->
-  	<tx:annotation-driven transaction-manager="txManager"/>
-
-    <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-        <property name="sessionFactory" ref="sessionFactory"/>
-    </bean>
-
-    <tx:advice id="txAdvice" transaction-manager="txManager">
-        <tx:attributes>
-            <tx:method name="save*" propagation="REQUIRED" />
-            <tx:method name="add*" propagation="REQUIRED" />
-            <tx:method name="create*" propagation="REQUIRED" />
-            <tx:method name="insert*" propagation="REQUIRED" />
-            <tx:method name="update*" propagation="REQUIRED" />
-            <tx:method name="merge*" propagation="REQUIRED" />
-            <tx:method name="del*" propagation="REQUIRED" />
-            <tx:method name="remove*" propagation="REQUIRED" />
-            <tx:method name="put*" propagation="REQUIRED" />
-            <tx:method name="use*" propagation="REQUIRED"/>
-            <!--hibernate4必须配置为开启事务 否则 getCurrentSession()获取不到-->
-            <tx:method name="get*" propagation="REQUIRED" read-only="true" />
-            <tx:method name="count*" propagation="REQUIRED" read-only="true" />
-            <tx:method name="find*" propagation="REQUIRED" />
-            <tx:method name="list*" propagation="REQUIRED" read-only="true" />
-            <tx:method name="*" propagation="REQUIRED" />
-        </tx:attributes>
-    </tx:advice>
-    
-    <aop:config expose-proxy="true">
-        <!-- 只对业务逻辑层实施事务 -->
-        <aop:pointcut id="txPointcut" expression="execution(* com..*Service.*(..))" />
-        <aop:advisor advice-ref="txAdvice" pointcut-ref="txPointcut"/>
-    </aop:config>
-
-	<bean id="treeInterceptor" class="com.core.dao.util.TreeIntercptor"/>
-	
-	<!-- 在复杂的查询统计中,提供一个可以绕开蹩脚的Hibernate的数据库接入点
-		jdbcTemplate尽量只执行查询操作，莫要进行更新，否则会破坏Hibernate的二级缓存体系
-	 -->
-	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-		<property name="dataSource" ref="dataSource" />
-	</bean> 
-</beans>

WebContent/WEB-INF/classes/spring-security.xml

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:security="http://www.springframework.org/schema/security"
-       xsi:schemaLocation="
-  			http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-            http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
-	
-	<!-- 该路径下的资源不用过滤 -->         
-	<security:http pattern="/css/**" security="none"/>    
-    <security:http pattern="/qui/**" security="none"/>
-    <security:http pattern="/js/**" security="none"/>
-    <security:http pattern="/ckeditor/**" security="none"/>
-    <security:http pattern="/image/**" security="none"/>
-    <security:http pattern="/images/**" security="none"/>    
-    <security:http pattern="/login.jsp" security="none"/> 
-    <security:http pattern="/WEB-INF/view/aah/content.jsp" security="none"/>
-    <security:http pattern="/jatoolsPrinter.cab" security="none"/>
-    <security:http pattern="/upload/*.xls" security="none"/>
-    <security:http pattern="/install_lodop32.exe" security="none"/>
-    <security:http pattern="/install_lodop64.exe" security="none"/>
-    <security:http pattern="/minicolors/**" security="none"/>
-        <security:http pattern="/pic/**" security="none"/>
-    <security:http pattern="/WEB-INF/view/wx/**" security="none"/>
-	
-	<!-- 自动配置模式，拦截所有请求进行匹配，有ROLE_USER才可以通过 --> 
-	<security:http  auto-config="true" use-expressions="true"> 
-	      
-		<!--使用表单登录-->
-		<!--	
-			login-page：指定登录页面。
-			login-processing-url：指定了客户在登录页面中按下 Sign In 按钮时要访问的 URL。
-			authentication-failure-url：指定了身份验证失败时跳转到的页面。
-			default-target-url：指定了成功进行身份验证和授权后默认呈现给用户的页面。
-			always-use-default-target：指定了是否在身份验证通过后总是跳转到default-target-url属性指定的URL。
-		-->
-		<security:form-login login-page="/login.jsp" always-use-default-target="false" />
-		<!--注销用户
-			logout-url：指定了用于响应退出系统请求的URL。
-			logout-success-url：退出系统后转向的URL。
-			invalidate-session：指定在退出系统时是否要销毁Session。
-		-->  
-		<security:logout invalidate-session="true" logout-url="/logout.do" logout-success-url="/login.jsp"/> 
-		<!-- 实现免登陆验证 -->
-  		<security:remember-me /> 
-  		<!-- 增加一个自定义的filter，放在FILTER_SECURITY_INTERCEPTOR之前， 实现用户、角色、权限、资源的数据库管理。  -->
-		<security:custom-filter before="FILTER_SECURITY_INTERCEPTOR" ref="permissionFilter" />
-		<!--尝试访问没有权限的页面时跳转的页面 ,accessDeniedHandler会接管操作,并转向/403.jsp页面-->
-		<security:access-denied-handler ref="accessDeniedHandler"/>
-	</security:http>
-	
-	<bean id="accessDeniedHandler" class="com.core.web.security.AccessDeniedHandlerImpl">
-		<property name="accessDeniedUrl" value="/403.jsp"></property>
-	</bean>
-	
-	<!-- 一个自定义的filter，必须包含authenticationManager,accessDecisionManager, 三个属性，我们的所有控制将在这三个类中实现 -->
-	<bean id="permissionFilter" class="com.core.web.security.PermissionFilter">
-		<!-- 用户拥有的权限 -->  
-		<property name="authenticationManager" ref="authenticationManager" />
-		<!-- 访问决策器，决定某个用户具有的角色，是否有足够的权限去访问某个资源 -->
-		<property name="accessDecisionManager" ref="accessDecisionManager" />
-		<!-- 资源与权限对应关系 -->  
-		<property name="securityMetadataSource" ref="securityMetadataSource" />
-	</bean>
-	
-	<!-- 认证管理器，实现用户认证的入口，主要实现UserDetailsService接口即可 -->
-	<security:authentication-manager alias="authenticationManager" >
-		<security:authentication-provider user-service-ref="userDetailsManager">
-			<!-- 密码采用md5加密方式加密 -->
-            <security:password-encoder base64="false" ref="passwordEncoder">
-                <!-- 用username做盐值加密，防止md5字典攻击 -->
-                <security:salt-source user-property="userName"/>
-            </security:password-encoder>
-		</security:authentication-provider>
-	</security:authentication-manager>
-	
-	<!-- 访问决策器，决定某个用户具有的角色，是否有足够的权限去访问某个资源 -->
-	<bean id="accessDecisionManager" class="com.core.web.security.AccessDecisionManagerImpl"/>
-	
-	<!-- 资源源数据定义，即定义某一资源可以被哪些角色访问 -->
-	<bean id="securityMetadataSource" class="com.core.web.security.SecurityMetadataSourceImpl" scope="singleton">
-		<constructor-arg index="0" ref="popResourceService"/>
-		<!--设置不需要登陆就可以访问-->
-		<property name="anonymousUrls">
-			<set>
-				<value>/login.do</value>
-				<value>/logout.do </value>
-				<value>/register/view.do</value>
-				<value>/wx/View.do</value>
-				<value>/wx/wxview.do</value>
-				<value>/wx/wxxquery.do</value>
-				<value>/wx/wxQuery.do</value>
-				<value>/wx/wxYearQuery.do</value>
-				<value>/wx/wxYearShow.do</value>
-				<value>/wx/viewYearWaterPlan.do</value>
-				<value>/wx/viewYearUnitNotice.do</value>
-				<value>/wx/wxCreate.do</value>
-				<value>/wx/binding.do</value>
-				<value>/wx/index.do</value>
-				<value>/wx/outOfPlan.do</value>
-				<value>/wx/binding2.do</value>
-				<value>/wx/bindInfo.do</value>
-				<value>/wx/claim.do</value>
-				<value>/wx/booking.do</value>				
-				<value>/register/checkUserName.do</value>
-				<value>/register/checkOrgName.do</value>
-				<value>/register/checkOrgCode.do</value>
-				<value>/register/getValidCode.do</value>
-				<value>/register/registerSubmit.do</value>
-				<value>/org/validateOrgCode.do</value>
-				<value>/org/validateOrgName.do</value>
-				<value>/user/validateUserName.do</value>
-<!-- 				<value>/notices/listNoticesShow.do</value> -->
-<!-- 				<value>/notices/view.do</value> -->
-<!-- 				<value>/notices/downloadFile.do</value> -->
-				<value>/wx/outOfPlan.do</value>				
-				<value>/wx/outOfPlanSearch.do</value>						
-				<value>/templateExport/templateExport.do</value>
-				<!--
-				
-				<value>/test/uploadData.do</value>
-				<value>/test/uploadPage.do</value>
-				<value>/test/formData.do</value>
-				-->
-				
-			</set>
-		</property>
-		<!--每个用户登陆后才可以访问的公共资源（如何后台框架）,不需要通过角色来分配权限才能看到-->
-		<property name="publicUrls">
-			<set>
-				<value>/frame/main.do</value>
-				<value>/frame/left.do</value>
-				<value>/frame/open.do</value>
-			</set>
-		</property>
-	</bean>
-	
-	<!-- 用户的密码加密或解密 -->  
-	<bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.Md5PasswordEncoder"/>
-</beans> 

WebContent/WEB-INF/classes/spring-service.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" default-lazy-init="true" xsi:schemaLocation="   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd   http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd         http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-
-	<!--用户信息 -->
-	<bean class="com.popedom.service.impl.PopUserServiceImpl" id="popUserService"/>
-	<!--角色信息 -->
-	<bean class="com.popedom.service.impl.PopRoleServiceImpl" id="popRoleService"/>
-	<!--组织机构信息 -->
-	<bean class="com.popedom.service.impl.PopOrgServiceImpl" id="popOrgService"/>
-	<!--系统资源信息 -->
-	<bean class="com.popedom.service.impl.PopResourceServiceImpl" id="popResourceService"/>
-	<!--用户权限信息 -->
-	<bean class="com.popedom.service.impl.UserDetailsServiceImpl" id="userDetailsManager"/>
-	<!--表单流程关联服务-->
-	<bean id="bpmFormProcessService" class="com.bpm.service.impl.BpmFormProcessServiceImpl"/>
-	<!--流程部署定义服务-->
-	<bean id="bpmDefinitionService" class="com.bpm.service.impl.BpmDefinitionServiceImpl"/>
-	<!--流程结点人员设置服务-->
-	<bean id="bpmNodeUserService" class="com.bpm.service.impl.BpmNodeUserServiceImpl"/>
-	<!--流程实例管理服务-->
-	<bean id="processRunService" class="com.bpm.service.impl.ProcessRunServiceImpl"/>
-	<!--给任务分配用户管理服务-->
-	<bean id="taskUserAssignService" class="com.bpm.service.impl.TaskUserAssignServiceImpl"/>
-	<!--任务审批意见服务-->
-	<bean id="bpmTaskOpinionService" class="com.bpm.service.impl.BpmTaskOpinionServiceImpl"/>
-			
-	<!--微信-->
-	<bean class="com.popedom.service.impl.WxOrgServiceImpl" id="WxOrgService"/>
-
-
-	<!-- 数据导入文件 -->
-	<bean class="com.data.service.impl.ImportDataFileServiceImpl" id="importDataFileService"/>
-
-	<bean class="com.base.service.impl.BaseOrgTypeServiceImpl" id="baseOrgTypeService"/>
-	<bean class="com.base.service.impl.BasePunishmentSectionServiceImpl" id="basePunishmentSectionService"/>
-	<bean class="com.base.service.impl.BaseSectionServiceImpl" id="baseSectionService"/>
-	<bean class="com.base.service.impl.BaseSystemParamServiceImpl" id="baseSystemParamService"/>
-	<bean class="com.base.service.impl.BaseUserTypeServiceImpl" id="baseUserTypeService"/>
-	<bean class="com.base.service.impl.BaseWaterPropertiesServiceImpl" id="baseWaterPropertiesService"/>
-	<bean class="com.base.service.impl.BaseStatusServiceImpl" id="baseStatusService"/>
-	
-	<bean class="com.bus.service.impl.BusAnnualPlanForWaterServiceImpl" id="busAnnualPlanForWaterService"/>
-	<bean class="com.bus.service.impl.BusMeterReadInfoServiceImpl" id="busMeterReadInfoService"/>
-	<bean class="com.bus.service.impl.BusOrgServiceImpl" id="busOrgService"/>
-	<bean class="com.bus.service.impl.BusQuarterlyAssessmentServiceImpl" id="busQuarterlyAssessmentService"/>
-	<bean class="com.bus.service.impl.BusCustomerMeterServiceImpl" id="busCustomerMeterService"/>
-
-<!-- 节水审批 -->
-	<bean class="com.water.service.impl.WaterCheckServiceImpl" id="waterCheckService"/>
-	<bean class="com.water.service.impl.WaterQuotaServiceImpl" id="waterQuotaService"/>
-	<bean class="com.water.service.impl.WaterApprovedServiceImpl" id="waterApprovedService"/>
-	<bean class="com.water.service.impl.WaterCheckRecServiceImpl" id="waterCheckRecService"/>	
-	
-<!--临时用水指标修改记录-->
-	<bean class="com.bus.service.impl.BusWaterAdjRecServiceImpl" id="busWaterAdjRecService"/>	
-</beans>