yxh - Gogs

yxh pushed to master at yxh/CNG

8da34ed990 Merge branch 'master' of https://git.hizima.com/yxh/CNG Conflicts: .classpath .mymetadata .project .settings/org.eclipse.core.resources.prefs WebRoot/WEB-INF/classes/com/runzhixing/action/FillingDataQueryAction.class WebRoot/WEB-INF/classes/com/runzhixing/action/SpeStationAction.class WebRoot/WEB-INF/classes/com/runzhixing/bean/CNGFillLog.class WebRoot/WEB-INF/classes/com/runzhixing/config/config.properties WebRoot/WEB-INF/classes/com/runzhixing/config/sqlxml/CNGStationNew.xml WebRoot/WEB-INF/classes/com/runzhixing/config/sqlxml/City.xml WebRoot/WEB-INF/classes/com/runzhixing/config/sqlxml/Copy of getRegion.xml WebRoot/WEB-INF/classes/com/runzhixing/config/sqlxml/Province.xml WebRoot/WEB-INF/classes/com/runzhixing/dao/CNGStationDao.class WebRoot/WEB-INF/classes/com/runzhixing/dao/interf/CNGStationInterface.class WebRoot/WEB-INF/classes/com/runzhixing/filter/MyFilter.class WebRoot/WEB-INF/classes/com/runzhixing/packageProcedure/FillingDataQueryProcedure.class WebRoot/WEB-INF/classes/com/runzhixing/servlet/LoginServlet.class WebRoot/WEB-INF/classes/com/runzhixing/tool/Tool.class WebRoot/WEB-INF/classes/struts.xml WebRoot/css/easyui/plugins/jquery.accordion.js WebRoot/css/easyui/plugins/jquery.calendar.js WebRoot/css/easyui/plugins/jquery.combo.js WebRoot/css/easyui/plugins/jquery.combobox.js WebRoot/css/easyui/plugins/jquery.combogrid.js WebRoot/css/easyui/plugins/jquery.combotree.js WebRoot/css/easyui/plugins/jquery.datagrid.js WebRoot/css/easyui/plugins/jquery.datalist.js WebRoot/css/easyui/plugins/jquery.datebox.js WebRoot/css/easyui/plugins/jquery.datetimebox.js WebRoot/css/easyui/plugins/jquery.datetimespinner.js WebRoot/css/easyui/plugins/jquery.dialog.js WebRoot/css/easyui/plugins/jquery.draggable.js WebRoot/css/easyui/plugins/jquery.droppable.js WebRoot/css/easyui/plugins/jquery.filebox.js WebRoot/css/easyui/plugins/jquery.form.js WebRoot/css/easyui/plugins/jquery.layout.js WebRoot/css/easyui/plugins/jquery.linkbutton.js WebRoot/css/easyui/plugins/jquery.menu.js WebRoot/css/easyui/plugins/jquery.menubutton.js WebRoot/css/easyui/plugins/jquery.messager.js WebRoot/css/easyui/plugins/jquery.mobile.js WebRoot/css/easyui/plugins/jquery.numberbox.js WebRoot/css/easyui/plugins/jquery.numberspinner.js WebRoot/css/easyui/plugins/jquery.pagination.js WebRoot/css/easyui/plugins/jquery.panel.js WebRoot/css/easyui/plugins/jquery.parser.js WebRoot/css/easyui/plugins/jquery.progressbar.js WebRoot/css/easyui/plugins/jquery.propertygrid.js WebRoot/css/easyui/plugins/jquery.resizable.js WebRoot/css/easyui/plugins/jquery.searchbox.js WebRoot/css/easyui/plugins/jquery.slider.js WebRoot/css/easyui/plugins/jquery.spinner.js WebRoot/css/easyui/plugins/jquery.splitbutton.js WebRoot/css/easyui/plugins/jquery.tabs.js WebRoot/css/easyui/plugins/jquery.textbox.js WebRoot/css/easyui/plugins/jquery.timespinner.js WebRoot/css/easyui/plugins/jquery.tooltip.js WebRoot/css/easyui/plugins/jquery.tree.js WebRoot/css/easyui/plugins/jquery.treegrid.js WebRoot/css/easyui/plugins/jquery.validatebox.js WebRoot/css/easyui/plugins/jquery.window.js WebRoot/index.jsp WebRoot/jsp/rzx/ExportSpecialequipmentdata.jsp WebRoot/jsp/rzx/bgman.jsp WebRoot/jsp/rzx/bgman_carauth.jsp WebRoot/jsp/rzx/bgman_carinput.jsp WebRoot/jsp/rzx/bgman_carinputauth.jsp WebRoot/jsp/rzx/dataMan/CNGQualityInto.jsp WebRoot/jsp/rzx/dataQuery/BlacklistQuery.jsp WebRoot/jsp/rzx/dataQuery/FillingdataQuery.jsp WebRoot/jsp/rzx/dataQuery/FillingdataQueryNew.jsp WebRoot/jsp/rzx/dataQuery/FillingdataQueryfilling.jsp WebRoot/jsp/rzx/dataQuery/LatelyFill.jsp WebRoot/jsp/rzx/fillingbgman.jsp WebRoot/jsp/rzx/modifybgman.jsp WebRoot/jsp/rzx/specialuserman.jsp WebRoot/jsp/rzx/testingbgman.jsp src/com/runzhixing/action/FillingDataQueryAction.java src/com/runzhixing/action/SpeStationAction.java src/com/runzhixing/bean/CNGFillLog.java src/com/runzhixing/bean/InfoViewrzx.java src/com/runzhixing/config/config.properties src/com/runzhixing/config/sqlxml/CNGStationNew.xml src/com/runzhixing/config/sqlxml/City.xml src/com/runzhixing/config/sqlxml/Copy of getRegion.xml src/com/runzhixing/config/sqlxml/Province.xml src/com/runzhixing/dao/CNGStationDao.java src/com/runzhixing/dao/interf/CNGStationInterface.java src/com/runzhixing/filter/MyFilter.java src/com/runzhixing/packageProcedure/FillingDataQueryProcedure.java src/com/runzhixing/servlet/LoginServlet.java src/com/runzhixing/tool/Tool.java src/struts.xml
8f07ab01a8 更新
7da802d53f 更新fastjsonjar
6174d6aefe 宁夏一网通接口
45f3ba177c 新增图片资质上传类型：机动车登记证书
View comparison for these 16 commits »