Skip to content

F
fgqyxxlr
Commit 9a0f240e by zhangwei
Options

提交0818

parent 0d633fd5
Showing with 1975 additions and 197 deletions
.DS_Store
No preview for this file type
.idea/workspace.xml
......@@ -20,46 +20,256 @@
</component>
<component name="ChangeListManager">
<list default="true" id="d39e557f-6347-46c3-b727-5e0f22aa8057" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrhonFgqyController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/OrhonShzzController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/backgroud-001.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/beijing.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/add.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/fgqy.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/add_bak.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/edit.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/shzz.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonShzz.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrhonFgqyMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrhonShzzMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/IOrhonFgqyService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/IOrhonShzzService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrhonFgqyServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrhonShzzServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/OrhonShzzMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img/left.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/logback.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/css/login.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/login.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/main.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/main.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/register.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/register.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/user/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/user/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/user/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application-druid.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/banner.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/banner.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/demo/controller/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/demo/controller/ReportController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/ehcache/ehcache-shiro.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/ehcache/ehcache-shiro.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/logback.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/beautifyhtml/beautifyhtml.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/beautifyhtml/beautifyhtml.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/blockUI/jquery.blockUI.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/blockUI/jquery.blockUI.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-fileinput/fileinput.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-select/bootstrap-select.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/bootstrap-table.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropbox/cropbox.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropbox/cropbox.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropbox/cropbox.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cropbox/cropbox.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/cxselect/jquery.cxselect.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/fullscreen/jquery.fullscreen.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/fullscreen/jquery.fullscreen.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/custom.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/icheck.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/iCheck/icheck.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-layout/jquery.layout-latest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-layout/jquery.layout-latest.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exhide-3.5.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/log v3.x.txt" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/jquery-ztree/3.5/log v3.x.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/layer.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layer/layer.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/font/iconfont.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/css/modules/laydate/default/laydate.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/lay/modules/laydate.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/lay/modules/laydate.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/layui.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/layui/layui.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2-bootstrap.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2-bootstrap.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/select2/select2.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/staps/jquery.steps.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/staps/jquery.steps.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/staps/jquery.steps.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/staps/jquery.steps.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/suggest/bootstrap-suggest.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote-bs3.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/summernote/summernote-bs3.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/typeahead/bootstrap3-typeahead.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/typeahead/bootstrap3-typeahead.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/additional-methods.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/additional-methods.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.extend.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.extend.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/jquery.validate.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/messages_zh.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ajax/libs/validate/messages_zh.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/animate.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/animate.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/bootstrap.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/bootstrap.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/font-awesome.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/font-awesome.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/login.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/animate.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/animate.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/bootstrap.min14ed.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/bootstrap.min14ed.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/font-awesome.min93e3.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/font-awesome.min93e3.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/style.min862f.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/main/style.min862f.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/css/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/fontawesome-webfont.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/fontawesome-webfont.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/glyphicons-halflings-regular.svg" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/i18n/messages.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/i18n/messages.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/bootstrap.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/bootstrap.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery-ui-1.10.4.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery-ui-1.10.4.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.tmpl.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/jquery.tmpl.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/metisMenu/jquery.metisMenu.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/metisMenu/jquery.metisMenu.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/slimscroll/jquery.slimscroll.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/js/plugins/slimscroll/jquery.slimscroll.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/css/ry-ui.css" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/css/ry-ui.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/js/common.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/login.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/login.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/register.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/static/ruoyi/register.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/autocomplete.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/autocomplete.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/basic.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/basic.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/button.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/button.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/cxselect.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/cxselect.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/datetime.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/datetime.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/duallistbox.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/duallistbox.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/grid.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/grid.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/jasny.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/jasny.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/select.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/select.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/sortable.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/sortable.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/tabs_panels.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/tabs_panels.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/upload.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/upload.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/validate.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/validate.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/wizard.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/form/wizard.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/icon/fontawesome.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/icon/fontawesome.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/icon/glyphicons.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/icon/glyphicons.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/dialog.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/dialog.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/form.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/layer.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/layer.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/check.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/check.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/parent.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/parent.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/radio.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/modal/table/radio.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/other.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/other.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/table.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/operate/table.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/echarts.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/echarts.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/metrics.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/metrics.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/peity.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/peity.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/sparkline.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/report/sparkline.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/button.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/button.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/data.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/data.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/editable.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/editable.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/event.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/event.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/export.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/export.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/fixedColumns.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/fixedColumns.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/footer.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/footer.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/groupHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/groupHeader.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/image.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/image.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/multi.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/multi.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/other.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/other.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/pageGo.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/pageGo.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/params.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/params.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/remember.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/remember.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/search.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/search.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/subdata.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/demo/table/subdata.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/404.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/404.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/500.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/500.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/unauth.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/error/unauth.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/include.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/include.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/login.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/main.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/main.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/main_v1.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/main_v1.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/logininfor/logininfor.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/logininfor/logininfor.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/online/online.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/online/online.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/operlog/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/operlog/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/operlog/operlog.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/operlog/operlog.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/server/server.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/monitor/server/server.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/config.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/config.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/config/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/dept.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/dept.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/tree.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dept/tree.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/data.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/data.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/data/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/tree.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/tree.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/type.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/dict/type/type.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/fgqy/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/fgqy/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/fgqy/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/fgqy/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/icon.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/icon.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/menu.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/tree.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/menu/tree.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/notice.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/notice/notice.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/post.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/post/post.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/authUser.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/authUser.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/dataScope.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/dataScope.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/role.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/role.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/selectUser.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/role/selectUser.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/add_bak.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/add_bak.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/shzz/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/authRole.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/authRole.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/avatar.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/avatar.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/profile.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/profile.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/resetPwd.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/profile/resetPwd.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/resetPwd.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/resetPwd.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/user.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/system/user/user.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/tool/build/build.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/templates/tool/build/build.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/generator.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/generator.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/mapper/generator/GenTableColumnMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/mapper/generator/GenTableMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/gen.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/gen.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/importTable.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/templates/tool/gen/importTable.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/add.html.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/add.html.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/edit.html.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/edit.html.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/list-tree.html.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/list-tree.html.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/list.html.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/list.html.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/tree.html.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/html/tree.html.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/controller.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/controller.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/domain.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/domain.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/mapper.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/mapper.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/service.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/service.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/serviceImpl.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/java/sub-domain.java.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/sql/sql.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/sql/sql.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/classes/vm/xml/mapper.xml.vm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/SysJobLogMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/mapper/quartz/SysJobMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/job.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/job.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/jobLog.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/classes/templates/monitor/job/jobLog.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/META-INF/ruoyi-system.kotlin_module" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/system/domain/OrhonFgqy.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/system/domain/OrhonFgqy.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysConfigMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDeptMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDictDataMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysDictTypeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysLogininforMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysMenuMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysNoticeMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysOperLogMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysPostMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleDeptMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysRoleMenuMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserOnlineMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserOnlineMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserPostMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/system/SysUserRoleMapper.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -90,7 +300,7 @@
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/demo/table" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
<property name="settings.editor.selected.configurable" value="project.propCompiler" />
</component>
<component name="RecentsManager">
......@@ -101,11 +311,11 @@
<recent name="com.ruoyi.system.domain" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/ruoyi-admin/src/main/resources/static/img" />
<recent name="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/demo/table" />
<recent name="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/shzz" />
<recent name="$PROJECT_DIR$/ruoyi-admin/src/main/resources/templates/system/fgqy" />
<recent name="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system" />
<recent name="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl" />
</key>
</component>
<component name="RunManager" selected="Application.RuoYiApplication">
......@@ -145,6 +355,7 @@
<list>
<item itemvalue="Application.OrhonShzzController" />
<item itemvalue="Application.RuoYiApplication" />
<item itemvalue="Spring Boot.RuoYiApplication" />
</list>
<recent_temporary>
<list>
......@@ -168,6 +379,10 @@
<workItem from="1594889231925" duration="209000" />
<workItem from="1594889458203" duration="2768000" />
<workItem from="1594957797426" duration="14287000" />
<workItem from="1596973532872" duration="1871000" />
<workItem from="1597582504957" duration="374000" />
<workItem from="1597583113685" duration="102000" />
<workItem from="1597583456843" duration="3387000" />
</task>
<servers />
</component>
......@@ -195,9 +410,10 @@
<screen x="1440" y="23" width="1920" height="973" />
</state>
<state x="1875" y="193" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596102803605" />
<state x="2151" y="130" key="#com.intellij.ide.util.MemberChooser" timestamp="1596620964189">
<screen x="1440" y="23" width="1920" height="969" />
<state x="533" y="112" key="#com.intellij.ide.util.MemberChooser" timestamp="1597584832530">
<screen x="0" y="23" width="1440" height="806" />
</state>
<state x="533" y="112" key="#com.intellij.ide.util.MemberChooser/0.23.1440.806@0.23.1440.806" timestamp="1597584832530" />
<state x="533" y="112" key="#com.intellij.ide.util.MemberChooser/0.23.1440.808@0.23.1440.808" timestamp="1594970303010" />
<state x="533" y="112" key="#com.intellij.ide.util.MemberChooser/0.23.1440.811@0.23.1440.811" timestamp="1594864549601" />
<state x="2151" y="130" key="#com.intellij.ide.util.MemberChooser/0.23.1440.877/1440.23.1920.969@1440.23.1920.969" timestamp="1596620964189" />
......@@ -207,13 +423,13 @@
</state>
<state x="458" y="174" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.23.1440.806@0.23.1440.806" timestamp="1595228478432" />
<state x="458" y="175" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.23.1440.811@0.23.1440.811" timestamp="1594887708841" />
<state width="1544" height="260" key="GridCell.Tab.0.bottom" timestamp="1596677275809">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.0.bottom" timestamp="1597719195196">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="264" key="GridCell.Tab.0.bottom/0.23.1440.795/1440.23.1920.1057@1440.23.1920.1057" timestamp="1595905354928" />
<state width="1398" height="242" key="GridCell.Tab.0.bottom/0.23.1440.797@0.23.1440.797" timestamp="1595472331131" />
<state width="1398" height="200" key="GridCell.Tab.0.bottom/0.23.1440.806@0.23.1440.806" timestamp="1595231965001" />
<state width="1398" height="186" key="GridCell.Tab.0.bottom/0.23.1440.808@0.23.1440.808" timestamp="1595814565341" />
<state width="1398" height="168" key="GridCell.Tab.0.bottom/0.23.1440.806@0.23.1440.806" timestamp="1597585007484" />
<state width="1398" height="168" key="GridCell.Tab.0.bottom/0.23.1440.808@0.23.1440.808" timestamp="1597719195196" />
<state width="1398" height="359" key="GridCell.Tab.0.bottom/0.23.1440.811@0.23.1440.811" timestamp="1594889436991" />
<state width="1398" height="276" key="GridCell.Tab.0.bottom/0.23.1440.812@0.23.1440.812" timestamp="1594947968004" />
<state width="1398" height="260" key="GridCell.Tab.0.bottom/0.23.1440.814@0.23.1440.814" timestamp="1594605654708" />
......@@ -222,13 +438,13 @@
<state width="1398" height="181" key="GridCell.Tab.0.bottom/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596159007889" />
<state width="1544" height="260" key="GridCell.Tab.0.bottom/0.23.1920.969@0.23.1920.969" timestamp="1596677275809" />
<state width="1525" height="269" key="GridCell.Tab.0.bottom/0.23.1920.973@0.23.1920.973" timestamp="1596442631669" />
<state width="1544" height="260" key="GridCell.Tab.0.center" timestamp="1596677275808">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.0.center" timestamp="1597719195195">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="264" key="GridCell.Tab.0.center/0.23.1440.795/1440.23.1920.1057@1440.23.1920.1057" timestamp="1595905354927" />
<state width="1398" height="242" key="GridCell.Tab.0.center/0.23.1440.797@0.23.1440.797" timestamp="1595472331131" />
<state width="1398" height="200" key="GridCell.Tab.0.center/0.23.1440.806@0.23.1440.806" timestamp="1595231965000" />
<state width="1398" height="186" key="GridCell.Tab.0.center/0.23.1440.808@0.23.1440.808" timestamp="1595814565340" />
<state width="1398" height="168" key="GridCell.Tab.0.center/0.23.1440.806@0.23.1440.806" timestamp="1597585007484" />
<state width="1398" height="168" key="GridCell.Tab.0.center/0.23.1440.808@0.23.1440.808" timestamp="1597719195195" />
<state width="1398" height="359" key="GridCell.Tab.0.center/0.23.1440.811@0.23.1440.811" timestamp="1594889436991" />
<state width="1398" height="276" key="GridCell.Tab.0.center/0.23.1440.812@0.23.1440.812" timestamp="1594947968001" />
<state width="1398" height="260" key="GridCell.Tab.0.center/0.23.1440.814@0.23.1440.814" timestamp="1594605654706" />
......@@ -237,13 +453,13 @@
<state width="1398" height="181" key="GridCell.Tab.0.center/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596159007889" />
<state width="1544" height="260" key="GridCell.Tab.0.center/0.23.1920.969@0.23.1920.969" timestamp="1596677275808" />
<state width="1525" height="269" key="GridCell.Tab.0.center/0.23.1920.973@0.23.1920.973" timestamp="1596442631669" />
<state width="1544" height="260" key="GridCell.Tab.0.left" timestamp="1596677275808">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.0.left" timestamp="1597719195194">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="264" key="GridCell.Tab.0.left/0.23.1440.795/1440.23.1920.1057@1440.23.1920.1057" timestamp="1595905354925" />
<state width="1398" height="242" key="GridCell.Tab.0.left/0.23.1440.797@0.23.1440.797" timestamp="1595472331131" />
<state width="1398" height="200" key="GridCell.Tab.0.left/0.23.1440.806@0.23.1440.806" timestamp="1595231965000" />
<state width="1398" height="186" key="GridCell.Tab.0.left/0.23.1440.808@0.23.1440.808" timestamp="1595814565340" />
<state width="1398" height="168" key="GridCell.Tab.0.left/0.23.1440.806@0.23.1440.806" timestamp="1597585007483" />
<state width="1398" height="168" key="GridCell.Tab.0.left/0.23.1440.808@0.23.1440.808" timestamp="1597719195194" />
<state width="1398" height="359" key="GridCell.Tab.0.left/0.23.1440.811@0.23.1440.811" timestamp="1594889436991" />
<state width="1398" height="276" key="GridCell.Tab.0.left/0.23.1440.812@0.23.1440.812" timestamp="1594947968000" />
<state width="1398" height="260" key="GridCell.Tab.0.left/0.23.1440.814@0.23.1440.814" timestamp="1594605654705" />
......@@ -252,13 +468,13 @@
<state width="1398" height="181" key="GridCell.Tab.0.left/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596159007889" />
<state width="1544" height="260" key="GridCell.Tab.0.left/0.23.1920.969@0.23.1920.969" timestamp="1596677275808" />
<state width="1525" height="269" key="GridCell.Tab.0.left/0.23.1920.973@0.23.1920.973" timestamp="1596442631668" />
<state width="1544" height="260" key="GridCell.Tab.0.right" timestamp="1596677275809">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.0.right" timestamp="1597719195196">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="264" key="GridCell.Tab.0.right/0.23.1440.795/1440.23.1920.1057@1440.23.1920.1057" timestamp="1595905354927" />
<state width="1398" height="242" key="GridCell.Tab.0.right/0.23.1440.797@0.23.1440.797" timestamp="1595472331131" />
<state width="1398" height="200" key="GridCell.Tab.0.right/0.23.1440.806@0.23.1440.806" timestamp="1595231965001" />
<state width="1398" height="186" key="GridCell.Tab.0.right/0.23.1440.808@0.23.1440.808" timestamp="1595814565341" />
<state width="1398" height="168" key="GridCell.Tab.0.right/0.23.1440.806@0.23.1440.806" timestamp="1597585007484" />
<state width="1398" height="168" key="GridCell.Tab.0.right/0.23.1440.808@0.23.1440.808" timestamp="1597719195196" />
<state width="1398" height="359" key="GridCell.Tab.0.right/0.23.1440.811@0.23.1440.811" timestamp="1594889436991" />
<state width="1398" height="276" key="GridCell.Tab.0.right/0.23.1440.812@0.23.1440.812" timestamp="1594947968002" />
<state width="1398" height="260" key="GridCell.Tab.0.right/0.23.1440.814@0.23.1440.814" timestamp="1594605654707" />
......@@ -267,12 +483,12 @@
<state width="1398" height="181" key="GridCell.Tab.0.right/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596159007889" />
<state width="1544" height="260" key="GridCell.Tab.0.right/0.23.1920.969@0.23.1920.969" timestamp="1596677275809" />
<state width="1525" height="269" key="GridCell.Tab.0.right/0.23.1920.973@0.23.1920.973" timestamp="1596442631669" />
<state width="1544" height="260" key="GridCell.Tab.1.bottom" timestamp="1596677275811">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.1.bottom" timestamp="1597719195197">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="242" key="GridCell.Tab.1.bottom/0.23.1440.797@0.23.1440.797" timestamp="1595472330978" />
<state width="1398" height="200" key="GridCell.Tab.1.bottom/0.23.1440.806@0.23.1440.806" timestamp="1595231964794" />
<state width="1398" height="186" key="GridCell.Tab.1.bottom/0.23.1440.808@0.23.1440.808" timestamp="1595814565218" />
<state width="1398" height="168" key="GridCell.Tab.1.bottom/0.23.1440.806@0.23.1440.806" timestamp="1597585007486" />
<state width="1398" height="168" key="GridCell.Tab.1.bottom/0.23.1440.808@0.23.1440.808" timestamp="1597719195197" />
<state width="1398" height="359" key="GridCell.Tab.1.bottom/0.23.1440.811@0.23.1440.811" timestamp="1594889436992" />
<state width="1398" height="276" key="GridCell.Tab.1.bottom/0.23.1440.812@0.23.1440.812" timestamp="1594947967808" />
<state width="1398" height="230" key="GridCell.Tab.1.bottom/0.23.1440.816@0.23.1440.816" timestamp="1594957628986" />
......@@ -280,12 +496,12 @@
<state width="1398" height="202" key="GridCell.Tab.1.bottom/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596103916619" />
<state width="1544" height="260" key="GridCell.Tab.1.bottom/0.23.1920.969@0.23.1920.969" timestamp="1596677275811" />
<state width="1398" height="202" key="GridCell.Tab.1.bottom/0.23.1920.973@0.23.1920.973" timestamp="1596105880377" />
<state width="1544" height="260" key="GridCell.Tab.1.center" timestamp="1596677275810">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.1.center" timestamp="1597719195197">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="242" key="GridCell.Tab.1.center/0.23.1440.797@0.23.1440.797" timestamp="1595472330977" />
<state width="1398" height="200" key="GridCell.Tab.1.center/0.23.1440.806@0.23.1440.806" timestamp="1595231964793" />
<state width="1398" height="186" key="GridCell.Tab.1.center/0.23.1440.808@0.23.1440.808" timestamp="1595814565217" />
<state width="1398" height="168" key="GridCell.Tab.1.center/0.23.1440.806@0.23.1440.806" timestamp="1597585007485" />
<state width="1398" height="168" key="GridCell.Tab.1.center/0.23.1440.808@0.23.1440.808" timestamp="1597719195197" />
<state width="1398" height="359" key="GridCell.Tab.1.center/0.23.1440.811@0.23.1440.811" timestamp="1594889436992" />
<state width="1398" height="276" key="GridCell.Tab.1.center/0.23.1440.812@0.23.1440.812" timestamp="1594947967807" />
<state width="1398" height="230" key="GridCell.Tab.1.center/0.23.1440.816@0.23.1440.816" timestamp="1594957628986" />
......@@ -293,12 +509,12 @@
<state width="1398" height="202" key="GridCell.Tab.1.center/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596103916619" />
<state width="1544" height="260" key="GridCell.Tab.1.center/0.23.1920.969@0.23.1920.969" timestamp="1596677275810" />
<state width="1398" height="202" key="GridCell.Tab.1.center/0.23.1920.973@0.23.1920.973" timestamp="1596105880376" />
<state width="1544" height="260" key="GridCell.Tab.1.left" timestamp="1596677275809">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.1.left" timestamp="1597719195197">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="242" key="GridCell.Tab.1.left/0.23.1440.797@0.23.1440.797" timestamp="1595472330977" />
<state width="1398" height="200" key="GridCell.Tab.1.left/0.23.1440.806@0.23.1440.806" timestamp="1595231964793" />
<state width="1398" height="186" key="GridCell.Tab.1.left/0.23.1440.808@0.23.1440.808" timestamp="1595814565217" />
<state width="1398" height="168" key="GridCell.Tab.1.left/0.23.1440.806@0.23.1440.806" timestamp="1597585007485" />
<state width="1398" height="168" key="GridCell.Tab.1.left/0.23.1440.808@0.23.1440.808" timestamp="1597719195197" />
<state width="1398" height="359" key="GridCell.Tab.1.left/0.23.1440.811@0.23.1440.811" timestamp="1594889436992" />
<state width="1398" height="276" key="GridCell.Tab.1.left/0.23.1440.812@0.23.1440.812" timestamp="1594947967807" />
<state width="1398" height="230" key="GridCell.Tab.1.left/0.23.1440.816@0.23.1440.816" timestamp="1594957628986" />
......@@ -306,12 +522,12 @@
<state width="1398" height="202" key="GridCell.Tab.1.left/0.23.1440.877/1440.23.1920.973@1440.23.1920.973" timestamp="1596103916618" />
<state width="1544" height="260" key="GridCell.Tab.1.left/0.23.1920.969@0.23.1920.969" timestamp="1596677275809" />
<state width="1398" height="202" key="GridCell.Tab.1.left/0.23.1920.973@0.23.1920.973" timestamp="1596105880376" />
<state width="1544" height="260" key="GridCell.Tab.1.right" timestamp="1596677275810">
<screen x="0" y="23" width="1920" height="969" />
<state width="1398" height="168" key="GridCell.Tab.1.right" timestamp="1597719195197">
<screen x="0" y="23" width="1440" height="808" />
</state>
<state width="1398" height="242" key="GridCell.Tab.1.right/0.23.1440.797@0.23.1440.797" timestamp="1595472330978" />
<state width="1398" height="200" key="GridCell.Tab.1.right/0.23.1440.806@0.23.1440.806" timestamp="1595231964794" />
<state width="1398" height="186" key="GridCell.Tab.1.right/0.23.1440.808@0.23.1440.808" timestamp="1595814565218" />
<state width="1398" height="168" key="GridCell.Tab.1.right/0.23.1440.806@0.23.1440.806" timestamp="1597585007485" />
<state width="1398" height="168" key="GridCell.Tab.1.right/0.23.1440.808@0.23.1440.808" timestamp="1597719195197" />
<state width="1398" height="359" key="GridCell.Tab.1.right/0.23.1440.811@0.23.1440.811" timestamp="1594889436992" />
<state width="1398" height="276" key="GridCell.Tab.1.right/0.23.1440.812@0.23.1440.812" timestamp="1594947967807" />
<state width="1398" height="230" key="GridCell.Tab.1.right/0.23.1440.816@0.23.1440.816" timestamp="1594957628986" />
......@@ -384,11 +600,6 @@
<line>147</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java</url>
<line>85</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
......
ruoyi-admin/src/main/resources/application-druid.yml
......@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/mac mysql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.16.5.6:3306/feigong?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
password: gBV4lMfojU+*
# 从库数据源
slave:
# 从数据源开关/默认关闭
......
ruoyi-admin/src/main/resources/application.yml
......@@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2019
# 实例演示开关
demoEnabled: true
demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /Users/zhangwei/Documents/xiangmushujuku
# 获取ip地址开关
......
ruoyi-admin/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<!--<property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<property name="log.path" value="E:/orhon/fgqyxxlr/logs" />
<property name="log.path" value="/home/logs" />
<!-- <property name="log.path" value="E:/orhon/fgqyxxlr/logs" />-->
<!-- <property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ruoyi-admin/src/main/resources/templates/login.html
......@@ -18,6 +18,23 @@
<style type="text/css">label.error {
position: inherit;
}</style>
<style>
.tianjia{
filter:alpha(opacity=50);
-moz-opacity:1;
-khtml-opacity: 1;
opacity: 1;
}
.tianjia img{
width: 90%;
}
</style>
<script>
if (window.top !== window.self) {
alert('未登录或登录超时。请重新登录');
......@@ -36,6 +53,9 @@
</div>
<div class="m-b"></div>
<h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4>
<div class="tianjia">
<img style="float:left" src="../img/left.png"/>
</div>
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
</div>
</div>
......
ruoyi-admin/src/main/resources/templates/system/fgqy/add.html
......@@ -337,22 +337,59 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人姓名：</label>
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="shzzxm" class="form-control" type="text" placeholder="请输入法定代表人姓名">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
......@@ -372,18 +409,142 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text" placeholder="请输入党组织书记姓名">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text" placeholder="请输入党组织书记电话">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
......
ruoyi-admin/src/main/resources/templates/system/fgqy/edit.html
......@@ -338,21 +338,57 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人姓名：</label>
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="shzzxm" th:field="*{shzzxm}" class="form-control" type="text" placeholder="请输入法定代表人姓名">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" th:field="*{shzzdh}" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
......@@ -361,7 +397,7 @@
<label class="col-sm-3 control-label">法人是否党员：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{isdy}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
......@@ -374,20 +410,143 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" th:field="*{dzzsjxm}" class="form-control" type="text" placeholder="请输入党组织书记姓名">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" th:field="*{dzzsjdh}" class="form-control" type="text" placeholder="请输入党组织书记电话">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
<div class="col-md-6">
......
ruoyi-admin/src/main/resources/templates/system/shzz/add.html
......@@ -429,9 +429,46 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -462,13 +499,137 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
......@@ -685,7 +846,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">集中组建阶段具体集中组建阶段具体集中组建阶段具体措施：</label>
<label class="col-sm-3 control-label">集中组建阶段具体措施：</label>
<div class="col-sm-8">
<textarea name="jzzjjtfs" class="form-control"></textarea>
</div>
......@@ -700,34 +861,34 @@
<th:block th:include="include :: bootstrap-fileinput-js"/>
<th:block th:include="include :: select2-js"/>
<script th:inline="javascript">
var prefix = ctx + "system/shzz"
$("#form-shzz-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shzz-add').serialize());
}
var prefix = ctx + "system/shzz"
$("#form-shzz-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shzz-add').serialize());
}
$("input[name='dzzjlsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='djsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='zxfzsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
}
$("input[name='dzzjlsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='djsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='zxfzsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>
ruoyi-admin/src/main/resources/templates/system/shzz/edit.html
......@@ -416,15 +416,52 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="fddbr" th:field="*{fddbr}" class="form-control" type="text" required>
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" th:field="*{shzzdh}" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -436,7 +473,7 @@
<label class="col-sm-3 control-label">法人是否党员：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:field="*{isdy}" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
......@@ -449,20 +486,143 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" th:field="*{dzzsjxm}" class="form-control" type="text">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjdh" th:field="*{dzzsjdh}" class="form-control" type="text">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
<div class="col-md-6">
......@@ -678,7 +838,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">集中组建阶段具体集中组建阶段具体集中组建阶段具体措施：</label>
<label class="col-sm-3 control-label">集中组建阶段具体措施：</label>
<div class="col-sm-8">
<textarea name="jzzjjtfs" th:field="*{jzzjjtfs}" class="form-control"></textarea>
</div>
......
ruoyi-admin/target/classes/application-druid.yml
......@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/mac mysql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.16.5.6:3306/feigong?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
password: gBV4lMfojU+*
# 从库数据源
slave:
# 从数据源开关/默认关闭
......
ruoyi-admin/target/classes/application.yml
......@@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2019
# 实例演示开关
demoEnabled: true
demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /Users/zhangwei/Documents/xiangmushujuku
# 获取ip地址开关
......
ruoyi-admin/target/classes/logback.xml
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<!--<property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<property name="log.path" value="E:/orhon/fgqyxxlr/logs" />
<property name="log.path" value="/home/logs" />
<!-- <property name="log.path" value="E:/orhon/fgqyxxlr/logs" />-->
<!-- <property name="log.path" value="/Users/zhangwei/Documents/xiangmushujuku/logs" />-->
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ruoyi-admin/target/classes/templates/login.html
......@@ -18,6 +18,23 @@
<style type="text/css">label.error {
position: inherit;
}</style>
<style>
.tianjia{
filter:alpha(opacity=50);
-moz-opacity:1;
-khtml-opacity: 1;
opacity: 1;
}
.tianjia img{
width: 90%;
}
</style>
<script>
if (window.top !== window.self) {
alert('未登录或登录超时。请重新登录');
......@@ -36,6 +53,9 @@
</div>
<div class="m-b"></div>
<h4 style="font-size: 30px;">欢迎使用非公企业和社会组织信息管理系统</strong></h4>
<div class="tianjia">
<img style="float:left" src="../img/left.png"/>
</div>
<strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
</div>
</div>
......
ruoyi-admin/target/classes/templates/system/fgqy/add.html
......@@ -337,22 +337,59 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人姓名：</label>
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="shzzxm" class="form-control" type="text" placeholder="请输入法定代表人姓名">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
......@@ -372,18 +409,142 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text" placeholder="请输入党组织书记姓名">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text" placeholder="请输入党组织书记电话">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
......
ruoyi-admin/target/classes/templates/system/fgqy/edit.html
......@@ -338,21 +338,57 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人姓名：</label>
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="shzzxm" th:field="*{shzzxm}" class="form-control" type="text" placeholder="请输入法定代表人姓名">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" th:field="*{shzzdh}" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
......@@ -361,7 +397,7 @@
<label class="col-sm-3 control-label">法人是否党员：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{isdy}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
......@@ -374,20 +410,143 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" th:field="*{dzzsjxm}" class="form-control" type="text" placeholder="请输入党组织书记姓名">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" th:field="*{dzzsjdh}" class="form-control" type="text" placeholder="请输入党组织书记电话">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
<div class="col-md-6">
......
ruoyi-admin/target/classes/templates/system/shzz/add.html
......@@ -429,9 +429,46 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -462,13 +499,137 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
......@@ -685,7 +846,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">集中组建阶段具体集中组建阶段具体集中组建阶段具体措施：</label>
<label class="col-sm-3 control-label">集中组建阶段具体措施：</label>
<div class="col-sm-8">
<textarea name="jzzjjtfs" class="form-control"></textarea>
</div>
......@@ -700,34 +861,34 @@
<th:block th:include="include :: bootstrap-fileinput-js"/>
<th:block th:include="include :: select2-js"/>
<script th:inline="javascript">
var prefix = ctx + "system/shzz"
$("#form-shzz-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shzz-add').serialize());
}
var prefix = ctx + "system/shzz"
$("#form-shzz-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shzz-add').serialize());
}
$("input[name='dzzjlsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='djsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='zxfzsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
}
$("input[name='dzzjlsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='djsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='zxfzsj']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>
ruoyi-admin/target/classes/templates/system/shzz/edit.html
......@@ -416,15 +416,52 @@
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人：</label>
<div class="col-sm-8">
<input name="fddbr" th:field="*{fddbr}" class="form-control" type="text" required>
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人电话：</label>
<label class="col-sm-3 control-label">法定代表人联系方式：</label>
<div class="col-sm-8">
<input name="shzzdh" th:field="*{shzzdh}" class="form-control" type="text" placeholder="请输入法定代表人电话">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人党内职务：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人行政职务：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治面貌：</label>
<div class="col-sm-8">
<input name="fddbr" class="form-control" type="text" required>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">法定代表人政治待遇：</label>
<div class="col-sm-8">
<input name="shzzdh" class="form-control" type="text" >
</div>
</div>
</div>
......@@ -436,7 +473,7 @@
<label class="col-sm-3 control-label">法人是否党员：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('orhon_isdy')}">
<input type="radio" th:field="*{isdy}" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<input type="radio" th:id="${'isdy_' + dict.dictCode}" name="isdy" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'isdy_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
......@@ -449,20 +486,143 @@
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" th:field="*{dzzsjxm}" class="form-control" type="text">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织班子成员行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党组织书记电话：</label>
<label class="col-sm-3 control-label">党组织班子成员政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjdh" th:field="*{dzzsjdh}" class="form-control" type="text">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者姓名：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者联系方式：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者党内职务：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者行政职务：</label>
<div class="col-sm-8">
<input name="dzzsjdh" class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">党务工作者政治待遇：</label>
<div class="col-sm-8">
<input name="dzzsjxm" class="form-control" type="text">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">党员情况</h4>
<div class="row">
<div class="col-md-6">
......@@ -678,7 +838,7 @@
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">集中组建阶段具体集中组建阶段具体集中组建阶段具体措施：</label>
<label class="col-sm-3 control-label">集中组建阶段具体措施：</label>
<div class="col-sm-8">
<textarea name="jzzjjtfs" th:field="*{jzzjjtfs}" class="form-control"></textarea>
</div>
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrhonFgqy.java
......@@ -182,6 +182,7 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "经营范围")
private String jyfw;
/** 住所 */
@com.ruoyi.common.annotation.Excel(name = "住所")
private String zs;
......@@ -254,6 +255,248 @@ public class OrhonFgqy extends com.ruoyi.common.core.domain.BaseEntity
@com.ruoyi.common.annotation.Excel(name = "年内发展党员数")
private String nnfzdys;
public OrhonFgqy() {
}
public String getZcbjbz() {
return zcbjbz;
}
public void setZcbjbz(String zcbjbz) {
this.zcbjbz = zcbjbz;
}
public String getZch() {
return zch;
}
public void setZch(String zch) {
this.zch = zch;
}
public java.util.Date getJyqxz() {
return jyqxz;
}
public void setJyqxz(java.util.Date jyqxz) {
this.jyqxz = jyqxz;
}
public java.util.Date getJyqxzhi() {
return jyqxzhi;
}
public void setJyqxzhi(java.util.Date jyqxzhi) {
this.jyqxzhi = jyqxzhi;
}
public String getHyml() {
return hyml;
}
public void setHyml(String hyml) {
this.hyml = hyml;
}
public String getScztlx() {
return scztlx;
}
public void setScztlx(String scztlx) {
this.scztlx = scztlx;
}
public String getDjjg() {
return djjg;
}
public void setDjjg(String djjg) {
this.djjg = djjg;
}
public String getDjzt() {
return djzt;
}
public void setDjzt(String djzt) {
this.djzt = djzt;
}
public String getZczbwy() {
return zczbwy;
}
public void setZczbwy(String zczbwy) {
this.zczbwy = zczbwy;
}
public java.util.Date getSjhzsj() {
return sjhzsj;
}
public void setSjhzsj(java.util.Date sjhzsj) {
this.sjhzsj = sjhzsj;
}
public java.util.Date getClrq() {
return clrq;
}
public void setClrq(java.util.Date clrq) {
this.clrq = clrq;
}
public String getTyshxydm() {
return tyshxydm;
}
public void setTyshxydm(String tyshxydm) {
this.tyshxydm = tyshxydm;
}
public String getZs() {
return zs;
}
public void setZs(String zs) {
this.zs = zs;
}
public String getDzzmc() {
return dzzmc;
}
public void setDzzmc(String dzzmc) {
this.dzzmc = dzzmc;
}
public String getDzzsdgx() {
return dzzsdgx;
}
public void setDzzsdgx(String dzzsdgx) {
this.dzzsdgx = dzzsdgx;
}
public String getHjxx() {
return hjxx;
}
public void setHjxx(String hjxx) {
this.hjxx = hjxx;
}
public String getDfzh() {
return dfzh;
}
public void setDfzh(String dfzh) {
this.dfzh = dfzh;
}
public String getYwdy() {
return ywdy;
}
public void setYwdy(String ywdy) {
this.ywdy = ywdy;
}
public String getJjfzsl() {
return jjfzsl;
}
public void setJjfzsl(String jjfzsl) {
this.jjfzsl = jjfzsl;
}
public String getFzdxsl() {
return fzdxsl;
}
public void setFzdxsl(String fzdxsl) {
this.fzdxsl = fzdxsl;
}
public String getDfsjbz() {
return dfsjbz;
}
public void setDfsjbz(String dfsjbz) {
this.dfsjbz = dfsjbz;
}
public String getHdzdmj() {
return hdzdmj;
}
public void setHdzdmj(String hdzdmj) {
this.hdzdmj = hdzdmj;
}
public String getDjjf() {
return djjf;
}
public void setDjjf(String djjf) {
this.djjf = djjf;
}
public String getSfpdjzdy() {
return sfpdjzdy;
}
public void setSfpdjzdy(String sfpdjzdy) {
this.sfpdjzdy = sfpdjzdy;
}
public String getXjpdjg() {
return xjpdjg;
}
public void setXjpdjg(String xjpdjg) {
this.xjpdjg = xjpdjg;
}
public String getJcqk() {
return jcqk;
}
public void setJcqk(String jcqk) {
this.jcqk = jcqk;
}
public String getDzzbgdz() {
return dzzbgdz;
}
public void setDzzbgdz(String dzzbgdz) {
this.dzzbgdz = dzzbgdz;
}
public String getLxdhjczh() {
return lxdhjczh;
}
public void setLxdhjczh(String lxdhjczh) {
this.lxdhjczh = lxdhjczh;
}
public String getDzyx() {
return dzyx;
}
public void setDzyx(String dzyx) {
this.dzyx = dzyx;
}
public String getJyfw() {
return jyfw;
}
public void setJyfw(String jyfw) {
this.jyfw = jyfw;
}
public String getNnfzdys() {
return nnfzdys;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment