From 45ae0edd8e270c911ca3fd29b707b82a941a8365 Mon Sep 17 00:00:00 2001
From: zc <Administrator@windows10.microdone.cn>
Date: Tue, 25 Jun 2019 09:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/BootStrapUI/index.jsp              | 145 +-------
 WebContent/BootStrapUI/index1.jsp             | 347 +++++++++++-------
 WebContent/BootStrapUI/main1.jsp              |  23 +-
 WebContent/WEB-INF/pages/zc/copyToMe.jsp      |  13 +-
 WebContent/WEB-INF/pages/zc/forMe.jsp         |  11 -
 WebContent/WEB-INF/pages/zc/form/payment.jsp  |   5 +-
 WebContent/WEB-INF/pages/zc/form/ticket.jsp   |   5 +-
 WebContent/WEB-INF/pages/zc/myFinish.jsp      |  11 -
 WebContent/WEB-INF/pages/zc/mySponsor.jsp     |  14 +-
 build/classes/.gitignore                      |   8 -
 .../com/sdry/service/cb/UserServiceImpl.class | Bin 2517 -> 2517 bytes
 .../service/hpf/OrderInfoServiceImpl.class    | Bin 3634 -> 3634 bytes
 .../sdry/service/hpf/PayPlanServiceImpl.class | Bin 3574 -> 3574 bytes
 .../service/hpf/ProjectCheckServiceImpl.class | Bin 3817 -> 3817 bytes
 .../hpf/ProjectCostAccountServiceImpl.class   | Bin 4723 -> 4723 bytes
 .../hpf/ProjectCostOutServiceImpl.class       | Bin 3698 -> 3698 bytes
 .../hpf/ProjectDemandFolloupServiceImpl.class | Bin 3788 -> 3788 bytes
 .../hpf/ProjectDemandServiceImpl.class        | Bin 4918 -> 4918 bytes
 .../hpf/ProjectExpendServiceImpl.class        | Bin 3683 -> 3683 bytes
 .../hpf/ProjectTaxOutServiceImpl.class        | Bin 3683 -> 3683 bytes
 .../service/hpf/RealOutCostServiceImpl.class  | Bin 3653 -> 3653 bytes
 .../hpf/RepaymentPlanServiceImpl.class        | Bin 3645 -> 3645 bytes
 .../service/hpf/SchedulePlanServiceImpl.class | Bin 3979 -> 3979 bytes
 .../sdry/service/tdd/CuserServiceImpl.class   | Bin 3312 -> 3312 bytes
 .../service/tdd/DepartmentServiceImpl.class   | Bin 3407 -> 3407 bytes
 .../com/sdry/service/tdd/JobServiceImpl.class | Bin 3274 -> 3274 bytes
 .../com/sdry/service/tdd/RegServiceImpl.class | Bin 3274 -> 3274 bytes
 .../sdry/service/tdd/StaffServiceImpl.class   | Bin 7210 -> 5006 bytes
 .../sdry/service/tdd/VehicleServiceImpl.class | Bin 3350 -> 3350 bytes
 .../web/controller/cb/UserController.class    | Bin 4617 -> 5435 bytes
 .../android/AndroidBudgetController$1.class   | Bin 883 -> 887 bytes
 .../AndroidOrderInfoController$1.class        | Bin 864 -> 868 bytes
 .../AndroidOrderInfoController$2.class        | Bin 867 -> 871 bytes
 .../android/AndroidPayPlanController$1.class  | Bin 847 -> 851 bytes
 .../android/AndroidPayPlanController$2.class  | Bin 850 -> 854 bytes
 .../AndroidProjectCheckController$1.class     | Bin 887 -> 891 bytes
 .../AndroidProjectCheckController$2.class     | Bin 890 -> 894 bytes
 ...ndroidProjectCostAccountController$1.class | Bin 935 -> 939 bytes
 ...ndroidProjectCostAccountController$2.class | Bin 938 -> 942 bytes
 .../AndroidProjectDemandController$1.class    | Bin 895 -> 899 bytes
 .../AndroidProjectDemandController$2.class    | Bin 898 -> 902 bytes
 ...roidProjectDemandFolloupController$1.class | Bin 1045 -> 1049 bytes
 ...roidProjectDemandFolloupController$2.class | Bin 1048 -> 1052 bytes
 ...AndroidProjectEvaluationController$1.class | Bin 927 -> 931 bytes
 ...AndroidProjectEvaluationController$2.class | Bin 930 -> 934 bytes
 .../AndroidProjectExpendController$1.class    | Bin 895 -> 899 bytes
 .../AndroidProjectExpendController$2.class    | Bin 898 -> 902 bytes
 .../AndroidProjectInfoController$1.class      | Bin 976 -> 980 bytes
 .../AndroidProjectInfoController$2.class      | Bin 947 -> 951 bytes
 .../AndroidProjectInfoController$3.class      | Bin 1014 -> 1018 bytes
 .../AndroidRepaymentPlanController$1.class    | Bin 895 -> 899 bytes
 .../AndroidRepaymentPlanController$2.class    | Bin 898 -> 902 bytes
 .../AndroidSchedulePlanController$1.class     | Bin 887 -> 891 bytes
 .../AndroidSchedulePlanController$2.class     | Bin 890 -> 894 bytes
 .../controller/hy/CliLogController$1.class    | Bin 757 -> 761 bytes
 .../controller/hy/DayLogController$1.class    | Bin 751 -> 755 bytes
 .../controller/hy/ItemLogController$1.class   | Bin 759 -> 763 bytes
 .../controller/hy/WorkPlanController$1.class  | Bin 1779 -> 1783 bytes
 .../controller/hy/WorkPlanController$2.class  | Bin 767 -> 771 bytes
 .../android/AndroidFinanceController$1.class  | Bin 1023 -> 1027 bytes
 .../android/AndroidFinanceController$2.class  | Bin 1011 -> 1015 bytes
 .../web/controller/tdd/ArpsController$1.class | Bin 734 -> 738 bytes
 .../web/controller/tdd/ArpsController$2.class | Bin 739 -> 743 bytes
 .../web/controller/tdd/ArpsController$3.class | Bin 742 -> 746 bytes
 .../zc/android/AndroidApplyController$1.class | Bin 1079 -> 956 bytes
 .../zc/android/AndroidApplyController$2.class | Bin 1081 -> 958 bytes
 .../zc/android/AndroidApplyController$3.class | Bin 1075 -> 952 bytes
 .../zc/android/AndroidApplyController$4.class | Bin 1083 -> 960 bytes
 .../zc/android/AndroidApplyController$5.class | Bin 1083 -> 960 bytes
 .../zc/android/AndroidApplyController$6.class | Bin 1081 -> 958 bytes
 .../zc/android/AndroidApplyController$7.class | Bin 1017 -> 894 bytes
 .../zc/android/AndroidApplyController$8.class | Bin 1020 -> 897 bytes
 .../AndroidManageBudgetController$1.class     | Bin 933 -> 937 bytes
 .../AndroidManageBudgetController$2.class     | Bin 931 -> 935 bytes
 .../AndroidManageBudgetController$3.class     | Bin 935 -> 939 bytes
 .../AndroidManageBudgetController$4.class     | Bin 943 -> 947 bytes
 .../AndroidManageBudgetController$5.class     | Bin 943 -> 947 bytes
 .../AndroidManageBudgetController$6.class     | Bin 945 -> 949 bytes
 .../sdry/service/tdd/StaffServiceImpl.java    |   8 -
 .../web/controller/cb/UserController.java     |  37 +-
 80 files changed, 270 insertions(+), 357 deletions(-)

diff --git a/WebContent/BootStrapUI/index.jsp b/WebContent/BootStrapUI/index.jsp
index 77af8c0..47112cf 100644
--- a/WebContent/BootStrapUI/index.jsp
+++ b/WebContent/BootStrapUI/index.jsp
@@ -3,149 +3,6 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <% Staff user = (Staff) session.getAttribute("staff"); %>
 <!DOCTYPE html>
-<%-- <<<<<<< HEAD
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>任务管理系统</title>
-		<meta name="renderer" content="webkit">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="format-detection" content="telephone=no">
-
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/css/layui.css" media="all" />
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/css/global.css" media="all">
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/font-awesome/css/font-awesome.min.css">
-
-	</head>
-
-	<body>
-		<div class="layui-layout layui-layout-admin" style="border-bottom: solid 5px #1aa094;">
-			<div class="layui-header header header-demo">
-				<div class="layui-main">
-					<div class="admin-login-box">
-						<a class="logo" style="left: 0;" href="index.jsp">
-							<span style="font-size: 22px;">任务管理系统</span>
-						</a>
-						<div class="admin-side-toggle">
-							<i class="fa fa-bars" aria-hidden="true"></i>
-						</div>
-						<!-- 
-							<div class="admin-side-full">
-								<i class="fa fa-life-bouy" aria-hidden="true"></i>
-							</div> 
-						-->
-					</div>
-					<ul class="layui-nav admin-header-item">
-
-						<li class="layui-nav-item">
-							<a href="javascript:;" class="admin-header-user">
-								<img src="${pageContext.request.contextPath}/BootStrapUI/images/0.jpg" />
-								<span>${staff.sname}</span>
-								<input type="hidden" id="bm" value="<%=user.getDepartment().getDname() %>">
-							</a>
-							<dl class="layui-nav-child">
-								<dd>
-									<a href="javascript:;"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>
-								</dd>
-								<dd>
-									<a href="javascript:;"><i class="fa fa-gear" aria-hidden="true"></i> 设置</a>
-								</dd>
-								<dd id="lock">
-									<a href="javascript:;">
-										<i class="fa fa-lock" aria-hidden="true" style="padding-right: 3px;padding-left: 1px;"></i> 锁屏 (Alt+L)
-									</a>
-								</dd>
-								<dd>
-									<a href="${pageContext.request.contextPath}/destroy.do"><i class="fa fa-sign-out" aria-hidden="true"></i> 注销</a>
-								</dd>
-							</dl>
-						</li>
-					</ul>
-					<ul class="layui-nav admin-header-item-mobile">
-						<li class="layui-nav-item">
-							<a href="${pageContext.request.contextPath}/destroy.do"><i class="fa fa-sign-out" aria-hidden="true"></i> 注销</a>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<div class="layui-side layui-bg-black" id="admin-side">
-				<div class="layui-side-scroll" id="admin-navbar-side" lay-filter="side"></div>
-			</div>
-			<div class="layui-body" style="bottom: 0;border-left: solid 2px #1AA094;" id="admin-body">
-				<div class="layui-tab admin-nav-card layui-tab-brief" lay-filter="admin-tab">
-					<ul class="layui-tab-title">
-						<li class="layui-this">
-							<i class="fa fa-dashboard" aria-hidden="true"></i>
-							<cite>控制面板</cite>
-						</li>
-					</ul>
-					<div class="layui-tab-content" style="min-height: 150px; padding: 5px 0 0 0;">
-						<div class="layui-tab-item layui-show">
-							<iframe src="${pageContext.request.contextPath}/BootStrapUI/main.jsp"></iframe>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="layui-footer footer footer-demo" id="admin-footer">
-				<div class="layui-main">
-					<p>2018 &copy;
-						<a href="#"> 北京盛达融元科技有限公司</a>
-					</p>
-				</div>
-			</div>
-			<div class="site-tree-mobile layui-hide">
-				<i class="layui-icon">&#xe602;</i>
-			</div>
-			<div class="site-mobile-shade"></div>
-			
-			<!--锁屏模板 start-->
-			<script type="text/template" id="lock-temp">
-				<div class="admin-header-lock" id="lock-box">
-					<div class="admin-header-lock-img">
-						<img src="${pageContext.request.contextPath}/BootStrapUI/images/0.jpg"/>
-					</div>
-					<div class="admin-header-lock-name" id="lockUserName">beginner</div>
-					<input type="text" class="admin-header-lock-input" value="输入密码解锁.." name="lockPwd" id="lockPwd" />
-					<button class="layui-btn layui-btn-small" id="unlock">解锁</button>
-				</div>
-			</script>
-			<!--锁屏模板 end -->
-			
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/layui.js"></script>
-			
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/datas/nav.js"></script>
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/datas/nav1.js"></script>
-			
-			<script src="${pageContext.request.contextPath}/BootStrapUI/js/index.js"></script>
-			<script>
-				layui.use('layer', function() {
-					var $ = layui.jquery,
-						layer = layui.layer;
-
-					$('#video1').on('click', function() {
-						layer.open({
-							title: 'YouTube',
-							maxmin: true,
-							type: 2,
-							content: 'video.jsp',
-							area: ['800px', '500px']
-						});
-                    });
-                    $('#pay').on('click', function () {
-                        layer.open({
-                            title: false,
-                            type: 1,
-                            content: '<img src="images/xx.png" />',
-                            area: ['500px', '250px'],
-                            shadeClose: true
-                        });
-                    });
-				});
-			</script>
-======= --%>
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
@@ -182,7 +39,7 @@
               <dd><a href="${pageContext.request.contextPath}/destroy.do">退出</a></dd>
             </dl>
           </li>
-          <li class="layui-nav-item to-index"><a href="${pageContext.request.contextPath }/loginToke.do">前台首页</a></li>
+          <li class="layui-nav-item to-index"><a href="${pageContext.request.contextPath }/loginToke.do">首页</a></li>
         </ul>
         
     </div>
diff --git a/WebContent/BootStrapUI/index1.jsp b/WebContent/BootStrapUI/index1.jsp
index 0bbfd91..3b2a663 100644
--- a/WebContent/BootStrapUI/index1.jsp
+++ b/WebContent/BootStrapUI/index1.jsp
@@ -1,148 +1,221 @@
 <%@page import="com.sdry.entity.tdd.Staff"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <% Staff user = (Staff) session.getAttribute("staff"); %>
 <!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>任务管理系统</title>
-		<meta name="renderer" content="webkit">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="format-detection" content="telephone=no">
-
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/css/layui.css" media="all" />
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/css/global.css" media="all">
-		<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/font-awesome/css/font-awesome.min.css">
-
-	</head>
-
-	<body>
-		<div class="layui-layout layui-layout-admin" style="border-bottom: solid 5px #1aa094;">
-			<div class="layui-header header header-demo">
-				<div class="layui-main">
-					<div class="admin-login-box">
-						<a class="logo" style="left: 0;" href="index.jsp">
-							<span style="font-size: 22px;">任务管理系统</span>
-						</a>
-						<div class="admin-side-toggle">
-							<i class="fa fa-bars" aria-hidden="true"></i>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>北京任务管理系统</title>
+	<meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/css/font.css">
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/lib/layui/css/layui.css">
+	<link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/css/xadmin.css">
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/lib/toastr/toastr.min.css">
+    
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/jquery/jquery-3.3.1.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/layui/layui.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/js/xadmin.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/md5/md5.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/toastr/toastr.min.js"></script>
+</head>
+<body>
+	
+    <!-- 顶部开始 -->
+    <div class="container">
+        <div class="logo"><a href="${pageContext.request.contextPath }/loginToke1.do">北京任务管理系统</a></div>
+        <div class="left_open">
+            <i title="展开左侧栏" class="iconfont">&#xe699;</i>
+        </div>
+        <ul class="layui-nav right" lay-filter="">
+          <li class="layui-nav-item">
+            <a href="javascript:;"><%=user.getSname() %></a>
+            <dl class="layui-nav-child"> <!-- 二级菜单 -->
+              <dd><a href="javascript:editPass()">修改密码</a></dd>
+              <dd><a href="${pageContext.request.contextPath}/destroy.do">退出</a></dd>
+            </dl>
+          </li>
+          <li class="layui-nav-item to-index"><a href="${pageContext.request.contextPath }/loginToke1.do">首页</a></li>
+        </ul>
+        
+    </div>
+    <!-- 顶部结束 -->
+    <!-- 中部开始 -->
+     <!-- 左侧菜单开始 -->
+    <div class="left-nav">
+		<div id="side-nav">
+			<ul id="nav">
+			   <c:forEach items="${menuList }" var="menu">
+			   		<li>
+			       		<a href="javascript:;">
+		          			<i class="iconfont">&#xe723;</i>
+		           			<cite>${menu.permissionName }</cite>
+		      			</a>
+		      			<ul class="sub-menu">
+		      				<c:forEach items="${menu.mList }" var="subMenu">
+		      					<li>
+		      						<a _href="${pageContext.request.contextPath }/${subMenu.url}">
+			                            <i class="iconfont">&#xe6a7;</i>
+			                            <cite>${subMenu.permissionName}</cite>
+			                        </a>
+		      					</li>
+		      				</c:forEach>
+		      			</ul>
+		   			</li>
+				</c:forEach>
+			</ul>
+		</div>
+    </div>
+    <!-- <div class="x-slide_left"></div> -->
+    <!-- 左侧菜单结束 -->
+    <!-- 右侧主体开始 -->
+    <div class="page-content">
+        <div class="layui-tab tab" lay-filter="xbs_tab" lay-allowclose="false">
+          <ul class="layui-tab-title">
+            <li class="home"><i class="layui-icon">&#xe68e;</i>消息提醒</li>
+          </ul>
+          <div class="layui-tab-content">
+            <div class="layui-tab-item layui-show">
+               <iframe src="${pageContext.request.contextPath}/BootStrapUI/main1.jsp" frameborder="0" scrolling="yes" class="x-iframe"></iframe>
+            </div>
+          </div>
+        </div>
+    </div>
+    <div class="page-content-bg"></div>
+    <!-- 右侧主体结束 -->
+    <!-- 中部结束 -->
+    <!-- 底部开始 -->
+    <div class="footer">
+        <div class="copyright">Copyright ©2019 北京盛达融元科技有限公司</div>  
+    </div>
+    <div id="formDiv" hidden>
+			<div class="box">
+			    <form class="layui-form layui-card-body" id="addform">
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">原密码</label>
+							<div class="layui-input-inline" style="width: 300px">
+								<input class="layui-input" id="srcPsd" type="password" style="width: 300px">
+							</div>
+						</div>
+						<div class="layui-inline" style="float: right;margin-right: 3em;margin-top: 10px;">
+							<font style="color:red; font-size: 24px;">*</font>
 						</div>
-						<!-- 
-							<div class="admin-side-full">
-								<i class="fa fa-life-bouy" aria-hidden="true"></i>
-							</div> 
-						-->
 					</div>
-					<ul class="layui-nav admin-header-item">
-
-						<li class="layui-nav-item">
-							<a href="javascript:;" class="admin-header-user">
-								<img src="${pageContext.request.contextPath}/BootStrapUI/images/0.jpg" />
-								<span>${staff.sname}</span>
-								<input type="hidden" id="bm" value="<%=user.getDepartment().getDname() %>">
-							</a>
-							<dl class="layui-nav-child">
-								<%--<dd>
-									<a href="javascript:;"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>
-								</dd>
-								<dd>
-									<a href="javascript:;"><i class="fa fa-gear" aria-hidden="true"></i> 设置</a>
-								</dd>
-								<dd id="lock">
-									<a href="javascript:;">
-										<i class="fa fa-lock" aria-hidden="true" style="padding-right: 3px;padding-left: 1px;"></i> 锁屏 (Alt+L)
-									</a>
-								</dd>--%>
-								<dd>
-									<a href="${pageContext.request.contextPath}/destroy.do"><i class="fa fa-sign-out" aria-hidden="true"></i> 注销</a>
-								</dd>
-							</dl>
-						</li>
-					</ul>
-					<ul class="layui-nav admin-header-item-mobile">
-						<li class="layui-nav-item">
-							<a href="${pageContext.request.contextPath}/destroy.do"><i class="fa fa-sign-out" aria-hidden="true"></i> 注销</a>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<div class="layui-side layui-bg-black" id="admin-side">
-				<div class="layui-side-scroll" id="admin-navbar-side" lay-filter="side"></div>
-			</div>
-			<div class="layui-body" style="bottom: 0;border-left: solid 2px #1AA094;" id="admin-body">
-				<div class="layui-tab admin-nav-card layui-tab-brief" lay-filter="admin-tab">
-					<ul class="layui-tab-title">
-						<li class="layui-this">
-							<i class="fa fa-dashboard" aria-hidden="true"></i>
-							<cite>消息提醒</cite>
-						</li>
-					</ul>
-					<div class="layui-tab-content" style="min-height: 150px; padding: 5px 0 0 0;">
-						<div class="layui-tab-item layui-show">
-							<iframe src="${pageContext.request.contextPath}/BootStrapUI/main1.jsp"></iframe>
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">新密码</label>
+							<div class="layui-input-inline" style="width: 300px">
+								<input class="layui-input" id="newPsd" type="password" style="width: 300px">
+							</div>
+						</div>
+						<div class="layui-inline" style="float: right;margin-right: 3em;margin-top: 10px;">
+							<font style="color:red; font-size: 24px;">*</font>
 						</div>
 					</div>
-				</div>
-			</div>
-			<div class="layui-footer footer footer-demo" id="admin-footer">
-				<div class="layui-main">
-					<p>2018 &copy;
-						<a href="#"> 北京盛达融元科技有限公司</a>
-					</p>
-				</div>
-			</div>
-			<div class="site-tree-mobile layui-hide">
-				<i class="layui-icon">&#xe602;</i>
-			</div>
-			<div class="site-mobile-shade"></div>
-			
-			<!--锁屏模板 start-->
-			<script type="text/template" id="lock-temp">
-				<div class="admin-header-lock" id="lock-box">
-					<div class="admin-header-lock-img">
-						<img src="${pageContext.request.contextPath}/BootStrapUI/images/0.jpg"/>
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">确认密码</label>
+							<div class="layui-input-inline" style="width: 300px">
+								<input class="layui-input" id="affirmPas" type="password" style="width: 300px">
+							</div>
+						</div>
+						<div class="layui-inline" style="float: right;margin-right: 3em;margin-top: 10px;">
+							<font style="color:red; font-size: 24px;">*</font>
+						</div>
 					</div>
-					<div class="admin-header-lock-name" id="lockUserName">beginner</div>
-					<input type="text" class="admin-header-lock-input" value="输入密码解锁.." name="lockPwd" id="lockPwd" />
-					<button class="layui-btn layui-btn-small" id="unlock">解锁</button>
-				</div>
-			</script>
-			<!--锁屏模板 end -->
-			
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/layui.js"></script>
-			
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/datas/nav.js"></script>
-			<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/datas/nav1.js"></script>
-			
-			<script src="${pageContext.request.contextPath}/BootStrapUI/js/index.js"></script>
-			<script>
-				layui.use('layer', function() {
-					var $ = layui.jquery,
-						layer = layui.layer;
-
-					$('#video1').on('click', function() {
-						layer.open({
-							title: 'YouTube',
-							maxmin: true,
-							type: 2,
-							content: 'video.jsp',
-							area: ['800px', '500px']
-						});
-                    });
-                    $('#pay').on('click', function () {
-                        layer.open({
-                            title: false,
-                            type: 1,
-                            content: '<img src="images/xx.png" />',
-                            area: ['500px', '250px'],
-                            shadeClose: true
-                        });
-                    });
-				});
-			</script>
+					<div class="layui-form-item">
+						<div class="layui-input-block">
+							<button class="layui-btn  layui-btn-blue" lay-submit lay-filter="addform" id="subform">确定</button>
+							<button class="layui-btn layui-btn-primary" style="margin-left:120px">取消</button>
+						</div>
+					</div>
+				</form>
+			</div>
 		</div>
-	</body>
+    <script type="text/javascript">
+    	function editPass(){
+    		layui.use(['table','layer','form'], function(){
+    			var table = layui.table;
+    			var layer = layui.layer;
+    			var form = layui.form;
+    			layer.open({
+	                type: 1 				//Page层类型
+	                ,area: ['515px', ''] 	//宽  高
+	                ,title: '修改密码'
+	                ,shade: 0.6 			//遮罩透明度
+	                ,maxmin: true 			//允许全屏最小化
+	                ,anim: 1 				//0-6的动画形式，-1不开启
+	                ,content:$('#formDiv')
+	                ,success:function(){
+	                	
+	                }
+    			});
+    			//修改
+    	        form.on('submit(addform)', function (data) {
+    	        	$("#subform").attr("disabled",true);
+    	        	var newPsd = $("#newPsd").val();
+    	        	var srcPsd = $("#srcPsd").val();
+    	        	$.ajax({
+    	        		url : '${pageContext.request.contextPath }/system/checkPsd.do',
+    	       			data : {"srcPsd":srcPsd},
+    	       			type : "post",
+    	       			//dataType : "json",
+    	    			}).done(
+    	    				function(res) {
+    	    		  			if(res>0){
+    	    		  				$.ajax({
+    	    		  	        		url : '${pageContext.request.contextPath }/system/editPsd.do',
+    	    		  	       			data : {"newPsd":newPsd},
+    	    		  	       			type : "post",
+    	    		  	       			//dataType : "json",
+    	    		  	    			}).done(
+    	    		  	    				function(res) {
+    	    		  	    		  			if(res>0){
+    	    		  	    		  				toastr.success('修改成功！');
+	    	    		  	    		  			setTimeout(function(){  //使用  setTimeout（）方法设定定时2000毫秒
+	    	    					  					//关闭模态框
+	    	    					  					// 父页面刷新
+	    	    		  	    	                    window.location.href="${pageContext.request.contextPath}/destroy.do"
+	    	    					  				},2000);
+    	    		  	    		  			}else{
+    	    		  	    		  				toastr.error('修改失败！');
+    	    		  	    		  				$("#subform").attr("disabled",false);
+    	    		  	    		  			}
+    	    		  	    				}
+    	    		  	    			)
+    	    		  			}else{
+    	    		  				toastr.error('原密码错误！');
+    	    		  				$("#subform").attr("disabled",false);
+    	    		  			}
+    	    				}
+    	    			)
+    	        	
+    	    		return false;
+    	        });
+    		})
+    	}
+    	$("#newPsd").change(function(){
+    		var newPsd = $("#newPsd").val();
+    		var affirmPas = $("#affirmPas").val();
+    		if(newPsd!=affirmPas && affirmPas!=""){
+    			toastr.warning('两次输入的密码不一致！');
+    			$("#affirmPas").val("");
+    		}
+    	})
+    	$("#affirmPas").change(function(){
+    		var newPsd = $("#newPsd").val();
+    		var affirmPas = $("#affirmPas").val();
+    		if(newPsd!=affirmPas && newPsd!=""){
+    			toastr.warning('两次输入的密码不一致！');
+    			$("#affirmPas").val("");
+    		}
+    	})
+    	toastr.options.positionClass = 'toast-top-center'; //提示框的位置设置为中上
+    </script>
+</body>
 </html>
\ No newline at end of file
diff --git a/WebContent/BootStrapUI/main1.jsp b/WebContent/BootStrapUI/main1.jsp
index d0c503e..3f470a1 100644
--- a/WebContent/BootStrapUI/main1.jsp
+++ b/WebContent/BootStrapUI/main1.jsp
@@ -5,6 +5,19 @@ String path=request.getContextPath();
 %>
 <html>
 <head>
+	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/css/font.css">
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/lib/layui/css/layui.css">
+	<link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/css/xadmin.css">
+    <link rel="stylesheet" media="all" href="${pageContext.request.contextPath }/lib/toastr/toastr.min.css">
+    
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/jquery/jquery-3.3.1.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/layui/layui.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/js/xadmin.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/md5/md5.js"></script>
+    <script charset="utf-8" src="${pageContext.request.contextPath }/lib/toastr/toastr.min.js"></script>
+
+	
     <script type="text/javascript" src="${pageContext.request.contextPath }/js/jquery-1.10.2.js"></script>
 	<link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/css/layui.css" media="all" />
 	<script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/layui.js"></script>
@@ -228,12 +241,10 @@ String path=request.getContextPath();
 </head>
 
 <body>
-
-	
-	  
+	<div class="x-body layui-anim layui-anim-up">
 	    <!--        表格           -->
 	    <table id="budgetList" style="font-size: 14px;"></table>
-	
-	   	        	 <table id="budgetList1" style="font-size: 14px;"></table>
-</script>
+		<table id="budgetList1" style="font-size: 14px;"></table>
+	</div>
+</body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/pages/zc/copyToMe.jsp b/WebContent/WEB-INF/pages/zc/copyToMe.jsp
index 061ad7d..648a89f 100644
--- a/WebContent/WEB-INF/pages/zc/copyToMe.jsp
+++ b/WebContent/WEB-INF/pages/zc/copyToMe.jsp
@@ -11,12 +11,12 @@
 <link rel="stylesheet" href="${pageContext.request.contextPath}/bootstrap-table/dist/bootstrap-table.min.css" />
 <link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/css/layui.css" media="all" />
 <link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/font-awesome/css/font-awesome.min.css">
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/zc/toastr.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap/js/tests/vendor/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap/dist/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap-table/dist/bootstrap-table.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap-table/src/locale/bootstrap-table-zh-CN.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/layui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/zc/toastr.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/js/uploadPreview.js"></script>
 <script type="text/javascript">
 	$(function() {
@@ -1266,17 +1266,6 @@
 						<label class="control-label col-sm-1" for="pickDate">申请类型</label>
 							<div class="col-sm-2">
 								<select class="form-control" lay-verify="required" name="type" id="type" >
-								<!-- <<<<<<< HEAD
-								  	<option value="">请选择申请类型</option>
-								  	<option value="0">请假申请</option>
-								  	<option value="1">出差申请</option>
-								  	<option value="2">用车申请</option>
-								  	<option value="3">用章申请</option>
-								  	<option value="4">付款申请</option>
-								  	<option value="5">开票申请</option>
-								  	<option value="6">管理预算申请</option>
-								  	<option value="7">项目完工申请</option>
-								======= -->
 								  	<option value="">请选择申请类型</option>
 								  	<option value="请假申请">请假申请</option>
 								  	<option value="出差申请">出差申请</option>
diff --git a/WebContent/WEB-INF/pages/zc/forMe.jsp b/WebContent/WEB-INF/pages/zc/forMe.jsp
index 897d1de..27809a7 100644
--- a/WebContent/WEB-INF/pages/zc/forMe.jsp
+++ b/WebContent/WEB-INF/pages/zc/forMe.jsp
@@ -1331,17 +1331,6 @@
 						<label class="control-label col-sm-1" for="pickDate">申请类型</label>
 							<div class="col-sm-2">
 								<select class="form-control" lay-verify="required" name="type" id="type" >
-								<!-- <<<<<<< HEAD
-								  	<option value="">请选择申请类型</option>
-								  	<option value="0">请假申请</option>
-								  	<option value="1">出差申请</option>
-								  	<option value="2">用车申请</option>
-								  	<option value="3">用章申请</option>
-								  	<option value="4">付款申请</option>
-								  	<option value="5">开票申请</option>
-								  	<option value="6">管理预算申请</option>
-								  	<option value="7">项目完工申请</option>
-								======= -->
 								  	<option value="">请选择申请类型</option>
 								  	<option value="请假申请">请假申请</option>
 								  	<option value="出差申请">出差申请</option>
diff --git a/WebContent/WEB-INF/pages/zc/form/payment.jsp b/WebContent/WEB-INF/pages/zc/form/payment.jsp
index 8802e71..e1757a2 100644
--- a/WebContent/WEB-INF/pages/zc/form/payment.jsp
+++ b/WebContent/WEB-INF/pages/zc/form/payment.jsp
@@ -77,7 +77,10 @@
 				<div class="layui-form-item">
 					<label class="layui-form-label">付款方</label>
 					<div class="layui-inline" style="width: 470px;">
-						<input style="width:500px" type="text" name="remark06" readonly="readonly" value="北京盛融科技有限公司" autocomplete="off" class="layui-input">
+						<select lay-verify="required" name="remark06" id="remark06" lay-search="">
+					  		<option value="北京盛融科技有限公司">北京盛融科技有限公司</option>
+					  		<option value="北京盛达融元科技有限公司">北京盛达融元科技有限公司</option>
+						</select>
 					</div>
 				</div>
 				<div class="layui-form-item">
diff --git a/WebContent/WEB-INF/pages/zc/form/ticket.jsp b/WebContent/WEB-INF/pages/zc/form/ticket.jsp
index 3491d48..b285e6d 100644
--- a/WebContent/WEB-INF/pages/zc/form/ticket.jsp
+++ b/WebContent/WEB-INF/pages/zc/form/ticket.jsp
@@ -143,7 +143,10 @@
 				<div class="layui-form-item">
 					<label class="layui-form-label">收款方</label>
 					<div class="layui-inline" style="width: 470px;">
-						<input style="width:500px" type="text" name="remark06" readonly="readonly" value="北京盛融科技有限公司" autocomplete="off" class="layui-input">
+						<select lay-verify="required" name="remark06" id="remark06" lay-search="">
+					  		<option value="北京盛融科技有限公司">北京盛融科技有限公司</option>
+					  		<option value="北京盛达融元科技有限公司">北京盛达融元科技有限公司</option>
+						</select>
 					</div>
 				</div>
 				<div class="layui-form-item">
diff --git a/WebContent/WEB-INF/pages/zc/myFinish.jsp b/WebContent/WEB-INF/pages/zc/myFinish.jsp
index fa17e14..465e595 100644
--- a/WebContent/WEB-INF/pages/zc/myFinish.jsp
+++ b/WebContent/WEB-INF/pages/zc/myFinish.jsp
@@ -1435,17 +1435,6 @@
 						<label class="control-label col-sm-1" for="pickDate">申请类型</label>
 							<div class="col-sm-2">
 								<select class="form-control" lay-verify="required" name="type" id="type" >
-								<!-- <<<<<<< HEAD
-								  		<option value="">请选择申请类型</option>
-								  	<option value="0">请假申请</option>
-								  	<option value="1">出差申请</option>
-								  	<option value="2">用车申请</option>
-								  	<option value="3">用章申请</option>
-								  	<option value="4">付款申请</option>
-								  	<option value="5">开票申请</option>
-								  	<option value="6">管理预算申请</option>
-								  	<option value="7">项目完工申请</option>
-								======= -->
 								  	<option value="">请选择申请类型</option>
 								  	<option value="请假申请">请假申请</option>
 								  	<option value="出差申请">出差申请</option>
diff --git a/WebContent/WEB-INF/pages/zc/mySponsor.jsp b/WebContent/WEB-INF/pages/zc/mySponsor.jsp
index a99f34b..bc726ea 100644
--- a/WebContent/WEB-INF/pages/zc/mySponsor.jsp
+++ b/WebContent/WEB-INF/pages/zc/mySponsor.jsp
@@ -1,4 +1,4 @@
-i<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 <html>
 <head>
@@ -11,12 +11,12 @@ i<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="U
 <link rel="stylesheet" href="${pageContext.request.contextPath}/bootstrap-table/dist/bootstrap-table.min.css" />
 <link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/css/layui.css" media="all" />
 <link rel="stylesheet" href="${pageContext.request.contextPath}/BootStrapUI/plugins/font-awesome/css/font-awesome.min.css">
-<script type="text/javascript" src="${pageContext.request.contextPath}/js/zc/toastr.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap/js/tests/vendor/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap/dist/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap-table/dist/bootstrap-table.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/bootstrap-table/src/locale/bootstrap-table-zh-CN.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath}/BootStrapUI/plugins/layui/layui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/zc/toastr.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/js/uploadPreview.js"></script>
 <script type="text/javascript">
 	$(function() {
@@ -1273,16 +1273,6 @@ i<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="U
 							<div class="col-sm-2">
 								<select class="form-control" lay-verify="required" name="type" id="type" >
 								  	<option value="">请选择申请类型</option>
-								<!-- <<<<<<< HEAD
-								  	<option value="0">请假申请</option>
-								  	<option value="1">出差申请</option>
-								  	<option value="2">用车申请</option>
-								  	<option value="3">用章申请</option>
-								  	<option value="4">付款申请</option>
-								  	<option value="5">开票申请</option>
-								  	<option value="6">管理预算申请</option>
-								  	<option value="7">项目完工申请</option>
-								======= -->
 								  	<option value="请假申请">请假申请</option>
 								  	<option value="出差申请">出差申请</option>
 								  	<option value="用车申请">用车申请</option>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 6be60d2..c2d9872 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,9 +1 @@
-/application-context.xml
 /com/
-/common-logging.properties
-/config.properties
-/db.properties
-/ehcache.xml
-/log4j.properties
-/mybatis-config.xml
-/springmvc-config.xml
diff --git a/build/classes/com/sdry/service/cb/UserServiceImpl.class b/build/classes/com/sdry/service/cb/UserServiceImpl.class
index 86917052d1ae25e49ca802a48109cb0148a92608..96a4010827562c1bb184ef9d2d9763e2ee32209d 100644
GIT binary patch
delta 104
zcmcaAd{ubEe-=jlNvy_`ZCMQk+;|vt7<9Q97#Tcx7|a+9HkYuLFi#HVl$y-M87QH{
w-~yE4Wnf@XV_*V81_m}Q?QIOMlk+%bB+M9$p^}<VNlq>80}Qs4=X06?03u!yV*mgE

delta 111
zcmcaAd{ubEe-=iwNvy_vTnvm1t~?C-3<iu0S{jolvM5cCWaVb_;9<~V(A`|ZTEfg|
zHu)t-mb5;DF;FQl0|SF50}~K3FmP&VA7HTE#^5qJn^Q(qhrtahuLhN8)6$+ipVJHg
D)b0}<

diff --git a/build/classes/com/sdry/service/hpf/OrderInfoServiceImpl.class b/build/classes/com/sdry/service/hpf/OrderInfoServiceImpl.class
index 7296b79a8670f4b8950ea4ea5c49ca4610158137..d1cfb3052b6d76288080b05edf68018dbe5278a8 100644
GIT binary patch
delta 100
zcmdlavq@&d3wB-$21_mmMusXL1`!6)$^Y361!{R1Oc~5Tg7rKM_6(Mr%{cg3CvV`D
znjFs?C}GM_4V2+!U|>*VU;;u01~x72Z45P&6L@79?I&;Km1L{~vLz==@JRsx23Ql#

delta 128
zcmdlavq@&d3wCLH21_mmMusXL1`!5P5UYlV!Ggh(kwHsi@&Q({$^0DRZ1p@0rVM7A
z%{cg3CqLnpnjFs?C~d)D160h*z`&r%zyyR044hip2N-0xF;q`Z;FXauWvGS9t3l=2
Rw6wP|)Bz<WCrj{20RY-%70mzu

diff --git a/build/classes/com/sdry/service/hpf/PayPlanServiceImpl.class b/build/classes/com/sdry/service/hpf/PayPlanServiceImpl.class
index b0c52dc1b1f72a5ed5cdc5230079df81c9100d46..12faf963c1bb25852f70d46456028806ae055024 100644
GIT binary patch
delta 113
zcmew+{Y`qqc6MGf26HY3MurL=1`!6)$>-P&1*&-%j2TQog0(yhwhZQ*Svgo(CztR_
zO;+X&lrUzf1j_I-FfgbwFaaS01DlriHioLn{k$>~whUHKNlmCEr<V2s2HD96c+CK_
Cx)Ry|

delta 119
zcmew+{Y`qqc6Mo726HY3MurL=1`!5P5UYxZ!HmJ2kwHsivI2|P<a_MmY_&WL#tbH#
zSvgo(8Eq$X@n%VzF<1eW@-i?mXfiMXAp--ami7S#*=-D!lY4k&M2#7$q4H`_c{VNW
I$p?7N0O;%z`Tzg`

diff --git a/build/classes/com/sdry/service/hpf/ProjectCheckServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectCheckServiceImpl.class
index bf1de50011f0657a338d25e18f88902adeefefc1..87c4288f029adabe9bc569cd15a5e1945e381279 100644
GIT binary patch
delta 88
zcmaDU`%-p;KZk$?gC!ROBSQlZg9w8tBZJoD0#@b8JsjKu%{&aI3}zs?Rvrd>2FuNJ
pIpSFvEhhiv&0;oXXq>!|PlT~)vNxa1<UhPpj4eQx<mB^wQUGN26<YuR

delta 110
zcmaDU`%-p;KZle(gC!ROBSQlZg9w8th}FcyV8LL?$e=a3fK^%0KPf9Uxx^YI(aOVM
z%3!v6E=N2oqy6N+yjhd~@JcZ@POj&ZkuYUw2CCp?U|>*VU;;u01~x72Z450yNy*9Q
G`J?~=xEDtN

diff --git a/build/classes/com/sdry/service/hpf/ProjectCostAccountServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectCostAccountServiceImpl.class
index 65bea4dd621825d61d8481f89c782b37a3e5401a..42f5bfe7456c352703487b05d99ddffa00ae9db7 100644
GIT binary patch
delta 116
zcmeyY@>ykr6PJJmgC!ROBg0f41`!5PMh30P2`rM6`PsN8*K=_T%-~@#WiSKD&*EXQ
zXRzEnf$JOF<d1?<lNSgEGMh3?n|we}gmL=hg@Q8D_6#;ab-WA=44Mo~K*+$rsil2@
QL3SI%OrX5v<VYbY0OMa7dH?_b

delta 103
zcmeyY@>ykr6PLI>gC!ROBg0f41`!5P5NkRQg9U@-WPdJ0wplz3rVM7ACvbgZW3->#
zE|?{4!C(Va!pp$Gpvk}lgbWOvTG|H~WVbO)o4im^hS`*1#^eKnB8)SEJjuzCLQ()p
C2^I<f

diff --git a/build/classes/com/sdry/service/hpf/ProjectCostOutServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectCostOutServiceImpl.class
index 74957540daaacb17f51435d8bf9ed5579252590b..de38b7e8f82fa605aa723cccfeb0dc377a620f68 100644
GIT binary patch
delta 100
zcmew)^GRldG6$~(gC!ROBSRGrg9wA@WGfCsfm$90QwB4TU_B3mJ%i=uLJkqu$sc&7
zCeP;$lrUwe2Fma<FfgbwFaaS01DlriHinwX3wUK1?I(Zam1L{~vLz=+@JRsx<p~sp

delta 120
zcmew)^GRldGKaW5gC!ROBSRGrg9w8th*iVGV8LKH*?_~4t)7R$l)-FsA%_U-WEDQC
z$@6&wr7ak2fQon-7#K7en1GOhfm2KS0E6r{hU&=+cx5C^8ET>OYEXGLE$wX#bwEkU
I$q{@~0Q(&jfB*mh

diff --git a/build/classes/com/sdry/service/hpf/ProjectDemandFolloupServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectDemandFolloupServiceImpl.class
index 7a533f83fcb1525c15ef34f6912ec3ece4ad37a4..533ad3184b4c8f1c43d02a2bf63960eccfd2a5e1 100644
GIT binary patch
delta 96
zcmX>jdq#FcIR~!=gC!ROBSRGrg9wA@<US5Vfm$90QwB4TU_B3mJ%i=uqa0GKj24q0
u@McMvGE@V_c^McO)EJn6kb!|sOM4qb&15}3naTHgr5NjgEXm26_@n@u$`efh

delta 106
zcmX>jdq#FcIft}8gC!ROBSRGrg9w8th*iVGV8LL?$e^V$S&&U>vL6#W7f86ChryJ=
zZ1YhLDON`N$q#t5Cg10kVyvF5$0sLN3zX+&U|>*VU;;u01~x72Z47llDapy3_@n?I
Cs}tb>

diff --git a/build/classes/com/sdry/service/hpf/ProjectDemandServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectDemandServiceImpl.class
index 47750984288d005dd30e29702c5bf79898b8c924..50a7668057e5bdb7104770ce2ff4c3f637efd4d1 100644
GIT binary patch
delta 112
zcmdm{woPrrNiJRs21_mmMuy!y3?dAolOJ#y3hd)yFl8_U2_E2KuxGH`EY5AjK6#6f
z)Z}ELKnYWZJwO>=1_lN-1|}e6U|`eI-o~(Z@_8W{33~<`sH7%Tl2c3j0E6r#VKV?7
CC=^rx

delta 125
zcmdm{woPrrNiHdS21_mmMuy!y3?dAoAl6<U1`7sDMh30PdMuKY&#`h%mStk+0?8cU
zVK8Md+bqs)#Lj3x*-I!(+JeCbD9+2kz@W*%1cVF>oLbrk7-Y9G?3sK<NJi9@VINdp
N4Jyy3r9Da53;><f6s-UN

diff --git a/build/classes/com/sdry/service/hpf/ProjectExpendServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectExpendServiceImpl.class
index 0f05b6c2a410d1c5ba9973d66f39be861506b1e3..86a925235e2fe5e7034195d011c708b728b57332 100644
GIT binary patch
delta 105
zcmaDX^H^qsC<m_vgC!ROBSRGrg9wA@WE~Defm$90QwB4TU_B3mJ%i=uWDa50$q#v@
zCQslEWHx1}p1grqgt2DwL|z$bdj=bzI$j0_22BPgAY@?R)Y3k{AiIsB4k#}<*^^HS
E09maR&j0`b

delta 110
zcmaDX^H^qsD2J3igC!ROBSRGrg9w8th*iVGV8LL?$e=Y@k418_9fv4eJr9E^gW2X}
z4q;YC`^n|JS<)5^Hb9lU3=9mK3`{`Cz`&`ceSkrB8$<QviM%q*rVO={H}Hxu)&Y5v
IlRf#Q04BK<ZvX%Q

diff --git a/build/classes/com/sdry/service/hpf/ProjectTaxOutServiceImpl.class b/build/classes/com/sdry/service/hpf/ProjectTaxOutServiceImpl.class
index 76709e2d073389579b53865244b260144df653a4..33f49cc86b9fa16c80db92f7106616f53301c5db 100644
GIT binary patch
delta 105
zcmaDX^H^qsC<m_vgC!ROBSRGrg9wA@WE~Defm$90QwB4TU_B3mJ%i=uWDa50$q#v@
zCQslEWHx1}p1grqgt2DwL|z$bdj=bzI$j0_22BPgAY@?R)Y3k{AiIsB4k#}<*^^HS
E09maR&j0`b

delta 110
zcmaDX^H^qsD2J3igC!ROBSRGrg9w8th*iVGV8LL?$e=Y@k418_9fv4eJr9E^gW2X}
z4q;YC`^n|JS<)5^Hb9lU3=9mK3`{`Cz`&`ceSkrB8$<QviM%q*rVO={H}Hxu)&Y5v
IlRf#Q04BK<ZvX%Q

diff --git a/build/classes/com/sdry/service/hpf/RealOutCostServiceImpl.class b/build/classes/com/sdry/service/hpf/RealOutCostServiceImpl.class
index 60d6c23b31e8676f5f3408606dd2a92b8cef1577..ec173c38ff635cf6e0fa8b037e9ba22d631df7e4 100644
GIT binary patch
delta 113
zcmX>qb5v%-Pj+4l21_mmMusXL1`!6)$pRdP0<}C0rVM5v!FnDBdj`wR?i_-wlMnMs
zO)laMlrUwe2Fma<FfgbwFaaS01DlriHinwX_jqL_>=|sJlA2ISPA%;N46>8?`OE;W
CJrbt?

delta 119
zcmX>qb5v%-Pj+d021_mmMusXL1`!5P5UYlV!Ggh(kwHsi@&#70$qF3eZ1p@0rVM7A
z-8lqV8SN)W@@7d}FxUW<@-i?mXfiMXAp--ami7S#*=-EflW+6Nh?+9gLgm$<@@!h#
Illl3~01zA#D*ylh

diff --git a/build/classes/com/sdry/service/hpf/RepaymentPlanServiceImpl.class b/build/classes/com/sdry/service/hpf/RepaymentPlanServiceImpl.class
index fae84eba113d2acd64c4aff1fcbad89c4d3ae680..43ee78324ec850d890fff591a0d37e625a2df193 100644
GIT binary patch
delta 96
zcmdlhvsY#VBL}YugDDpSBSRSvg9wA@WC;#Kfl3|*Lk1&|U^NeeHG}D9e-1`gMw7{b
uyjc>44CO#^UIqpRH3lXiWME*^(%!~UF?l|(%;W%GDaI-wOLDR@pA-NA2@tIS

delta 94
zcmdlhvsY#VBZs&(gDDpSBSRSvg9w8th*iPEV8UQJnUBMet(u3ykilrPKL;Z#qxIxK
s-mJ+1yi$ziljrlwiB$rX@-i?ms4*}BAp--Omi9J=Dxj3)WMw`n00<Tkc>n+a

diff --git a/build/classes/com/sdry/service/hpf/SchedulePlanServiceImpl.class b/build/classes/com/sdry/service/hpf/SchedulePlanServiceImpl.class
index d09ff012f1a8c067c5b531f918b3f6d7c54a5d27..f33a04fd0779152c47b520544955990783949d01 100644
GIT binary patch
delta 96
zcmeB{@0Q;X$-!&FV9Le7$WYJ2Ai^Lzxq!n^poxdUkiiHf*uukL&0xBDImdTaMw7|&
u`LZMo85)4%ybKHsY79(3$iTp+rM-=zaq?R}naT6`q!^olEXm1*{89jZXA}+q

delta 107
zcmeB{@0Q;X$suLUV9Le7$WYJ2Ai^LDVm0zGm@t?!GH6W}V3C}>mX&LA4+l3}3lD=K
zgVE;Y9N$?PttZdt%bGloPl~Z&vLe5Xgdsx{P#-S?1A`g^6A&^muxV*;V`v6SN=`21
GmjVD@coeb#

diff --git a/build/classes/com/sdry/service/tdd/CuserServiceImpl.class b/build/classes/com/sdry/service/tdd/CuserServiceImpl.class
index 3bb24f4d88a0b98ec7d7e952bdf852657b5e0b5c..83e7b6414d8ceeb5a5c08fe98c5f76aa32d48960 100644
GIT binary patch
delta 110
zcmew$`9X5S8a6>c230NwMuu=61}z3{Mg}d7$%$-AljWG%Cx2jL5s2bp@MiD<DTv`=
zP+?Hr{ELl~b#fk$)MQznKnZV#2%rov0|SE^0}~K3FtBN9Z)1p@EXN}=nVCn5F&fB{
JoP3Q(3IN456yyK^

delta 91
zcmew$`9X5S8a8Pa230NwMuu=61}z3{5G#_0!H+?ekwHsiaw413<oj&gY%x3x-V8pQ
sf3b10PF}<#HCdJ?a56KG6l26>IUX5iZ-%JJg*+mR(LkQ$<ZC=q0DOTI8UO$Q

diff --git a/build/classes/com/sdry/service/tdd/DepartmentServiceImpl.class b/build/classes/com/sdry/service/tdd/DepartmentServiceImpl.class
index 3d09d4fadc2e14ee1c1ec0ebeaa8376fa7ea768e..28aebcca37b2ce2b32bf828ea0020bbf84b8d9c7 100644
GIT binary patch
delta 98
zcmX>vbzW)%8#`|xgDMvTBSSb3gBFAKWLb7YfhZmZKL&r0U<?m~3WMtA5OzM+$!B?_
wCfD!;O87BE0A+X?7#P$Tn1GOhflW($8$;yejXW}wlX#>Uqk$~R$)>zg0A=_RI{*Lx

delta 92
zcmX>vbzW)%8@rSWgDMvTBSSb3gBF7}h!x4h5Xhj)$e=a3fK77p1{SW#mh9YYF+2=@
t4E~!#*!fr|GxADJuHgxsoWvu=7%_Pxj~rvv<O@6^jL|^0<YZG`DF8WH6W;&;

diff --git a/build/classes/com/sdry/service/tdd/JobServiceImpl.class b/build/classes/com/sdry/service/tdd/JobServiceImpl.class
index dcf5161f61c2981d678f44b1d64c76f901962cdb..29e0987a58af7155db7efd9ecc43e497ab338784 100644
GIT binary patch
delta 96
zcmX>lc}j9a2OF;+gDMvTBSSb3gBFAK<oRrd0#Q5+-V8n<!5AI}6$aJK*Vx!u8T}^T
v<Ia-sW{3ca^D;0ns4*}BAp--Omi9J=$jLf9GL!FeOEE?RS(1}C@JImwj>i(r

delta 104
zcmX>lc}j9a2b;7CgDMvTBSSb3gBF7}h!x4h;K!iK$e^V$*_KUd@@_V6wiq4;Zw8;u
z*Vx!u8C53V<Ib9Vms^T4VsZkHjD$Bs6i^c{0|SE^0}~K3FtBN9Z)1oCN=i=Nz#|0!
DF8LHs

diff --git a/build/classes/com/sdry/service/tdd/RegServiceImpl.class b/build/classes/com/sdry/service/tdd/RegServiceImpl.class
index 3e2f315e5b8349bbc2d1b6e964063d5b4540cb2a..1c6a63ec84de7d37798c9d96348c4a6de561d819 100644
GIT binary patch
delta 96
zcmX>lc}j9a2OF;+gDMvTBSSb3gBFAK<oRrd0#Q5+-V8n<!5AI}6$aJK*Vx!u8T}^T
v<Ia-sW{3ca^D;0ns4*}BAp--Omi9J=$jLf9GL!FeOEE?RS(1}C@JImwj>i(r

delta 104
zcmX>lc}j9a2b;7CgDMvTBSSb3gBF7}h!x4h;K!iK$e^V$*_KUd@@_V6wiq4;Zw8;u
z*Vx!u8C53V<Ib9Vms^T4VsZkHjD$Bs6i^c{0|SE^0}~K3FtBN9Z)1oCN=i=Nz#|0!
DF8LHs

diff --git a/build/classes/com/sdry/service/tdd/StaffServiceImpl.class b/build/classes/com/sdry/service/tdd/StaffServiceImpl.class
index c841fb878a55b8789efa3620638adb499c2f1c78..bc9a0986a2122a32699cc5e142db7b0fd11a754b 100644
GIT binary patch
delta 20
ccmZ2w(Wk!QAlKw`T$Ph~cvfsa$g_qW09_6UeE<Le

delta 998
zcmb`GTTc@~6vzLww7a<7YD)`k4M-(Mw1qYil}msKsA(c5m>9fOu#_r9D5mWLR%q4W
zT~QqHg4cQ@nvjsFjeQbd{2qJ*Uwx`)7OY@=bRN#k{LgRZTy}P{`a{FQH&tt19`3-t
zw!M5&P1;+QhYE%#8n(m3u!V0ZcJfhKvk7&FFfTMr3zugbA5*LNxU6&u`IUw#+-Fc*
zmxsGA7K(-k+||ROcp?(3c8{EP4<r)j;!S@4nZZOP;tP)q`@^xpc)T|m_P2-Pk^QmI
zaKuMW-e`KiCcTeKrg^1UT}hC3<5GGEMUVlcJfBeJ&0&v(PJNk0dkz5!2fZ~}bQZPN
z<j}>?WSm2@%a}tq!y<xB2En=vS@h%(lJFhn6>F6o`Wa5O&Ox3if;c$9Fq>bjn1$JE
z$58qUqFE%o3zUKZ7P7lxCff}Yj=+VZ*o0$n<2dSZ0s#ckgOdo6?I$fts~Gw)MmsB=
z+6g1s6iQ&DS**%YL0xqrf>E4@L^t&yi3?P8J!<J(dYr<h2-ON$ny`zc9EKqeFJuKw
zL5G4v3<~9hJa(-X6$DpgX|?>Db-=Ld0#KAoRH8)TLAHTAEv5F$5=8xyUcXETaF(}O
zD$QXWD4-MktGU!pJ^mYw@r>r+^Oj=s6<jUg*Z6vCB};Li)lqsKH|SD^o48f*-xhwp
zWO17AU{d$q#Xa6--OOvPe>8fFq&1rAz;%Y6tj>HU#;3QIVFnL$?I&q<^a(_yhj=73
zmJ#udRd@`>TWlK*9a+rsA0_2ZKb{gMzVuc~NupWyc(ZsWoNSu6*~$d_TxX~7@?UI*
boUUFv`&#ea8?2*QrTtr)-_i0v{6gw4Fc`<S

diff --git a/build/classes/com/sdry/service/tdd/VehicleServiceImpl.class b/build/classes/com/sdry/service/tdd/VehicleServiceImpl.class
index 99f5d2083fccfdc9c7ed4d6a69f381e22af449e9..a0fe6bc0fafeb4effdf299084b4de92227d8a218 100644
GIT binary patch
delta 124
zcmbOxHBD;61vUXc230NwMuu=61}z3{Mh30PuURE0&t>D9%*)O#5XHmb&ENx)kKtiZ
zVNl&H$Ii_<c?yrzWM`g032%l7pbReq1A`g^6A&^muxV*;V~Cu*o<~MPg+T)<sR@<j
O)Y3k{pg;Kmj~M`TB@}-E

delta 111
zcmbOxHBD;61vYUN230NwMuu=61}z3{5G#_0!H+?8@?ADVwiq4;Zw8;ua_ro!j4G40
zc(SDZ7&L%Nco`TNG#QwHkb!|yOZxzW{x*h)$!mCIM7<fJpz>-^c{VNW$q#tU01-?P
AX#fBK

diff --git a/build/classes/com/sdry/web/controller/cb/UserController.class b/build/classes/com/sdry/web/controller/cb/UserController.class
index a0488997ce966d82ea3dc9f218290b757eb1da52..b329cbfb398f949aac90ea32a3bb2be4c0ee4720 100644
GIT binary patch
literal 5435
zcmeHLS#%WF5xq|fJsLG&h5(-65Lp<I5Te1@7)F>_Y(|LyBMD)^2_DTnNe!d!p}Pkp
zWpNfe&g#V3ZO10gM)uf=BalgKXHT5PSx?T%NB;7k<C9Mka^LG&dNi7teB{p`nqFSL
zs(MxTR#of8e?R*ifGzm5fd+xjj5}fZS#QcZCr7M|>ja*g%Sq45j95o}>FqARG0-G%
z-Kq51w3SOcW7eUOQ!*0>ES}B`PWgeH7?j>wJ0k_w^p}-VgL-F8XRPDZVm$)Mfr1m*
z6LQ%0?U9`9bsRTH2e#|@0xSEKrAaGYerXLz-z|6<$(^Pjq(?`~23OY_46<2kFe1cF
z3wGF!9qbfn?C2a8Xxi;&WgLxIY@!t=57KWt@?c?NM0!JM`Xi9&cQfhSaN4ugbMa+U
zFmBVqu8Pf9iX3e>_q$`ZBk-DzPJOU2goA-+J7Zkl*6(^_mY-LTqh5MKo^!p^IwK>t
zldTTInS%6#1L=G|+}eCLoh#7S1(r4u!)s|R7g}r4*CF>b*UxnnBdSu8lYuoJ1bJ&e
ze+H%RGw40_*Y$=0sV(<(*7dcd`2Yi(>vgijwmiqf#rIBTWM1dh!0QE;Y7E(~)pw}8
zLMbca?AE$AYUAPO2^hJ{%}(_gSS_%jUMS~tFOGIBj$tihrXkge4y-rODX=QUUuo0a
zXqo831_E(R2E75(I8q20<h5attFjwSc*q(0xsm8ElSGmQ!IV{oY#iO#WMVUJCIo3f
zGiSif$-P>TFH0yY1a{8qxBY-BZxL9cBdcHTPy6EpNt{II`EC;+#<zoFDS<^5F}2sk
z4%{vfvjgd+1J@H+UZuaU_`atVZ$PhsJLo_~Luu8-F6<_&968CNP>u8QvG)qJ&pmdj
zG*k}Q0)abCv>+bG9`u=bBi_UWF%o^*$l-Mr>UT+?Rvf?~0|y0eENfSZQ<bM2)xq$E
ziMw!E;Cf%?SibI(-h{2;ziUc4pbWG}lc@C<Qy7i*Aj@3YRxyG4Bo&QewhSB*SfS&k
z9S%9at6=A{(u?CLjv2VSs<4I<CXVBTfT8JqXmk#?iV=-st5{6p7{Z%XMSF|Dvgk>Q
z>z%`K44_YmrA>?=!_vWGA|0N*J1Sq-MA7%27>IbWL1`LOn#SiSC>g9NcqIjD=P47X
zv5e>o+)!SDY{G;Cmxmuu`v*0iSh9~BI3uub-k{$p9bz|kxFEf$Fzj*Uu~>zd@Gjsi
z51EtBSU?}Cil;w{NfT3;7HIJcBfc)g3iy3}^TafUw+Y<D0udDaw%gk_wWXbGo9(m8
zRi605Y3qpL9W>Rc1!8z7+r+i(+7xb3KEK<<dsOOLeHkzyN5`cn6(1fj(ToMHco6S5
z@IHan<v5gpUgA-u6Px$|K1lF|Q18v<4oIh<7=Lr0la-SKJsp)M7R7LFI9c^8l-C7E
zm6H#fcu2*z$+xFv3?F40CyFLiA^n(%kK+@nTUQmyby1WRK@!1833tOWe2T1R|C5ud
zOn=72Bc;fw&T^1#GKR-!J($X~kw1>}2A(JtLCv*3Cy-;(Q&jq#PHr@}#l;?_`|~Eg
zfG-jY>1;N%FEDg%Zr1HorOq*@8@8%WQf#>bZS|XO*px{EFKoQTetqGp4o!?tq?wkD
z|Eq5+Yv53>p6uf>PKHwDp4DnD8kmJV+l?BcDmdW_ZZq@c8mr59C=jWIlnH0ZN(Ug@
zYFsJdyCTJn&H2!w#B^qE;Z^Y}lO&4nxq|9wEC8Bn>|E2CTKIELo?ln3D77uAAsoS1
zJxUU>#c^_LBw*?+JLWgU5j%45owTwgvXPPA5s9mAT9M}>rPQwNkzN1ATuqGB-i3of
zI&+$~wCe_b$R4P&J!zG&9+{G&h&1qH?ydp`2fp&Wx0&UxGW~6i;peQOn)h5WvK)6k
zcS={QYqD0VRn-uSSw%&ycmcmQ@f-Y>K5(WebFsZR^~`&mkd3OU{m#Vi)#pOocG#Qk
zY+4O|@j?A*vd>nZ4NI#(oHi=2)d$0TgDF3pJn5<mW>r45dT=94ej`8A8hB;h=dZyh
zb&c@~H5<)&*UV>r#_)F`*DYQ-^PzeDMJ#%nHx0Osze)knh9&$}q7*;^OL-;mv5Zp6
z%pyK5=iiDG5I(Ng3cLBN<Qo&or+A5~>x!srEUR0I8+d}(QMQR2S82rw?yD$n<0+w(
zH(a3%uOfLF?Z+<Srh{FHHM3aPz)W?gnvzX3uu{#Jv4v~5rWPc&ri^6sEVc=xS}x#Z
zvSk)K1!ec7V(Xv5zGQ3$`)ASLfK)sg59Q1Y=uVnNxq(#cWegol8kaD95%(lpXK-=`
z_a?G47@dJl?Uc+3JbLvdrCZ-UPOGuY$kPQc)si%3;6Fl@Mx(xM;?{F1LupOCRjK6q
zXyWZfeX$EL68EKI$rk0>yXfQnO7DA14t_}B2`ueOd_;Nsa3i`CpPa#`yAzK#UczT*
z@Z`~M74jyX!BHf6e+yx7EAzFLLB0)ZunnDT$Gu45FnVBfpns6phxzU?j#KAx2fo79
zr#PZN&x!gk*o(hnAO42@_&fUWG6(D{9I+RmUznVtSKyFN=|e;UlTu8ny89BotWdza
z3)I+vm{@|Z;%iLwGSP&!_&UA30sq1`@J%9X4gQI5;oC%AC;ma}PZI>a9KXMV@6!Ln
z^y(SP#p&-Vd=E2(?|Dq)BIRP#eg>B?OQ64ub$C|GUFONxmo0q1Y~csA5Ndml+Cq7C
z_dMmFgmIOjiW?9HIt;vEpxr>Xf$au<WN-{L7$97wjfM3@4D6v0cZ9N?R~7r}377Qk
zuP;KY1}8l<UeSIqpg(y<uKe^>u7qT+<;u@Ot~Ax-$`H|Xgj^YBkdG3RcN2}rh{NN=
z%n4%e9&+UbxpItLIY|WGOYEhI))C?-ORh+AWt3bQCs%Bu>lC?inq0||D-OBhzRHyf
zo&Nt^`2~JCZ<~5ix2b((Qv+$gsB0F#609FD@gD|}juqFd0ZYwUowntnbg9I#;Hko<
Sbo_x@8t_N*Ic%GM0{#Q1i<?gX

delta 1850
zcmah~TX0iF82<L;Bzux<TN*5Iu$H1NNm@c_%k>lrl#4BvP(XoF5d%GK0&NPpP(UT(
z4e`Ro^#+KDsCYv_FeOw0FL>d_M@Pre8E1UZ86C$NADm&V|49I`gX2T8|L%VK{on5Y
ze@TDEjxyK9zs{TmP>YKvT)#4<&L?*{N6N4e@&_?Y#*}KehMO7ek!ZWQNgi`fQhF^&
zsT`>+XOm=$Q<vwIQOqa5SE_X{3N%y_I-Ur1bhr^f6~{P+61m%1Viy>XYT0Zv)LI5z
zmbi463pJQ1FbR|8QQKJGREEN}p^c%cWFpd4)fkG07lhWkFvX&s#sD|!F_UA4Wa?1c
zEHudB>X_0wn8z`f!Sm0_ri2*_C3<24x1v$5R7=@>xmEQKX%=vTk~SeIun;Y>PaWl0
zjN3Vu$Zyp#wmYy?+U*VMa)xqQD9WdEtY8?PCGHAEJFAu?Vv%TPLo(9UZpK`=6L)c}
zWEe6SA+QQ}%cJ&*S}Rry(!EChY#*7o3_%xK(IL=@uq<@c6|7}oW39C=Ypq+hIcjQK
z(Ic=PMGRV^CzsKUIiTCbkznBAP&{aEqR8g+ui)6o;Fa6dA{lghd@dwWU<unSum$%p
zIJ(SeXCj;hH(49^32a457I3e+jiF4g=VkP|4-(Q}8j7};YIs<7^YOkUwhKIpH4N^!
znIIX<!e-2Lg5fa%I~;C2ft?&r$_w0Q+lAfoH@?DKkEaBrl~;{NwwM~8p-Xg|(PVQZ
zp0N7iIf3V~S8mXzj&Q+?{Q@ssNwG9y_69@UrrheR<+kn+-D@26*Z7mgt|~?Cvr4j?
zx-Bg7Sw{AXfd2#1oNdc$dX#oEo{05qrgT-8LpRd+P~ancEZun%906Pq_*Bl#lguH%
z&O4mSr>hL3&+s;|I7*R6HkeFvg+`la^l=&#454oaEdmozNZ-S9+wfp0%?OBFP)7R<
zH=>+oH_@6(vl4KMtdnDCBx>asTBnia_ru%T2Y)J9>8Z$Itb+5XF;rbmV}fDt#}wK$
z42P%A;JQ77=?sSR2v+IN3}!RJHW^yQDcq)OX)MTKkphE!l*5T52<YN6ZkgfkM{BFj
zPou35A>Exudm5%ElE%6;qDG2a&<zax2EMe&v(W)ctMwyE8hQ<<&ePbmmpHjC8>&Qb
zufZ)^&;1rB?XUAZaG6j$0`7Up&~&Gz?GX~W!{UAXio!h%FJfq==V?psv$hlhp3!OS
z3s?`WW*>SrMo>Hj8m6KM28vNfk2(#0Ovfy;{vymk1T(Rn#yzyQAG2|gobfv5;yC8v
z92)Tznfn{e$9HJPk63`;5yT}dWDc}2fyLP(?nFM2V)<99NYMe(MpdTBs;2^t4jjZw
zRM8^*iAo$IiN!?rG7eMom*XeAf>)`&eoFEh=;kD_g@n98;un#`Hwot=u_bs5Z<GHI
zq6bF_rxB(D@8B3xPNFL&-4^f!-Mivyig&N3I7umTbf*ZF!&}jNgg*p6fQfK%FpdC6
zn#0Rc!%@$1nv>HxJq-rPWqH?wq$~_a6QSrx4(uPWejl%gzLv1@zad%5B-!GUrKp~s
z^bFl`ur0FAOVMV|di{f}_x@n(E&U(souwQ~)^Pv!^tmkYJW6DFI=?c5^9&h$LjM)|
karws$1(VyTG%K%RzuFSiAvt3!_>9gf_&m#R8Tt$0Z{5gW>;M1&

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidBudgetController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidBudgetController$1.class
index 98ef02ba858be0f20b2841da3ea6273981e784e1..c4a2c94c7dd1ea02759560f2b61feaa18c0cab6f 100644
GIT binary patch
delta 49
vcmey&_ML5m5VNWU0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnMXV`c{c-;4(Z

delta 45
vcmey)_L*&i5VN8Q0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3{dIkN)*#!&|L

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidOrderInfoController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidOrderInfoController$1.class
index a2c65f1cb12a1dcec339bfeda2c8abb5462f879d..c54ad7cf75a1698275c1c956971f51322079ce9d 100644
GIT binary patch
delta 26
hcmaFB_JnQ2e<ntYNzBrmTntPM3=E76tdkX(9ROu71$+Pi

delta 22
dcmaFD_JD1}e<ntgNzBr$Yz&MH43kxu9RO081#JKT

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidOrderInfoController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidOrderInfoController$2.class
index 2be2d02dfc7fee2b38d672c05a39b366420c7327..452f9ae88476a30fda3ff34b5b54cbd65ee1921d 100644
GIT binary patch
delta 49
vcmaFN_MB}46SJxX0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnMXWo8Ee)|>{#

delta 45
vcmaFP_Lyx06SJZT0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3{dI<o@+z99y-

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidPayPlanController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidPayPlanController$1.class
index fe526308551daabaaf3ec7276a463aaa3e80bb6c..491847eb1f7512efec65ec95c936821277ba8576 100644
GIT binary patch
delta 27
jcmX@lcA0I%J0?bp$?ut@Ik^~^7#J8B8CWOtGdlnPbU+3t

delta 23
fcmcc2cAjm+J0?bx$?ut@S=ksE85kxDGdlnPUbO}o

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidPayPlanController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidPayPlanController$2.class
index a99ce2d161c251a732df086abdc9675bc376a15a..c3910683debba6e70ff4e787408ed91e3a12492f 100644
GIT binary patch
delta 49
vcmcb_c8zVrM<!JZ1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&Ld*^T`0@vU

delta 45
vcmcb{c8P7nM<zuR1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl-^F=ht<-A4y;

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCheckController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCheckController$1.class
index 22aca540c56083307fc9b52e729159de0caf0eb8..ab98692fa65fd79093c2750c9e31a4b37bb22faa 100644
GIT binary patch
delta 49
vcmey)_M2^k7_+Jc0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnMXb7lts;m8LS

delta 45
vcmey(_ML5m7_*`Y0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3{dHM0W%$Xy2p

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCheckController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCheckController$2.class
index 3313b00f339070057f0caf8c783a9ce88fa1a66d..fae3df1e4602fed2fd6da6a6aa3d9000e319d771 100644
GIT binary patch
delta 27
icmeyx_K$6YBr~JMWGQB8PA&!}1_lO32G+?|%nkruF9iSq

delta 23
ecmeyz_KR(UBr~JQWGQB8RyGDk28PLY%nkrd>;&-u

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCostAccountController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCostAccountController$1.class
index 356396eb9252909578ccb132f95528be6fed828b..bf1a880a86e385d2cf159c944b6ba8d9078a7f49 100644
GIT binary patch
delta 49
vcmZ3^zM6f58?&kf0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?bY=$t%=QM?

delta 45
vcmZ3@zMOr78?&Mb0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`yHnRf&wL=ET

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCostAccountController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectCostAccountController$2.class
index 818b684adb4924c175815be9cda3e41670a8a737..cec682c185190fa5c43d365c629bd818f631a813 100644
GIT binary patch
delta 27
icmZ3*zK(r^Co`kPWG`lEPA&!}1_lO32G+@0%nkrm0R-{@

delta 23
ecmZ3-zKVT=Co`kTWG`lERyGDk28PLb%nkrWwglq<

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandController$1.class
index 7fd6f461d351f5062b2b437acc174157a6d36aa8..510ed24d71310f88d49196c736f5ba56fd287b1c 100644
GIT binary patch
delta 27
icmey**37;^j+xP7vOKdiCl><~0|Nsi1M6gaW(NRLodlWy

delta 23
ecmZo>|IfBTj+xP9vOKdiD;onN1H)uzW(NR62n34&

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandController$2.class
index 093bdc8dfc932cc73b826b38eb1f5e1f45ce8d5b..76bc76123a857d66b5caa2e4786f13489d707135 100644
GIT binary patch
delta 49
vcmZo-Z)4w}$gFC?zyyR03|v~;TY<!O2A+*T9uosUNDM5)$iO<;iP-@FxJw2@

delta 45
vcmZo;Z(`q|$gF6>zyyR03|v~;TY<!O2A+*T9uosUkYr<EWMG)=#_Rw9qErSn

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandFolloupController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandFolloupController$1.class
index c5aa5c88527031bd759f39d49f1edc71fa66a6b3..4515c61877eecef86257b80c045690233889ea91 100644
GIT binary patch
delta 49
vcmbQrF_UA%7G_lo1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&SD76E+QtWw

delta 45
vcmbQqF_mM(7G^~g1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<ao6HUX!Q%&l

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandFolloupController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectDemandFolloupController$2.class
index b9b65c297864e2d8a69f1b4617f2cb31ebac9918..e48028f6d05fe46b943447705e905f47d8490ec9 100644
GIT binary patch
delta 49
vcmbQiF^6Nrc4k!z1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&H<%p&+;az=

delta 45
vcmbQkF@s~nc4kEr1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<aJIoFM!)ynR

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectEvaluationController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectEvaluationController$1.class
index 63ad9955c75c4ada35ceeea3a6467df3bf882505..e31c3ad82d181a36cdb9dd95d97fe9daeaa55acb 100644
GIT binary patch
delta 27
icmbQwzL<T39W$fFWP4_5PA&!}1_lO32G+^(%nkrh_XN8D

delta 23
ecmZ3?KA(Mq9W$fJWP4_5RyGDk28PMW%nkrTTm-BD

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectEvaluationController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectEvaluationController$2.class
index 2e4a337dda434c0a37fd82e999d66cb2e5701c61..e9e7bd7dce5a4be687f2b287142b2f2dc6ca7a3b 100644
GIT binary patch
delta 49
vcmZ3)zKnf?BeSXn0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?BxVNy$}0xL

delta 45
vcmZ3+zKDH;BeS9j0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`y8nXicva|-Y

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectExpendController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectExpendController$1.class
index cd6442928ef0939e8824d3d9b0612598e73902d4..189e153a33db6d212b168a703bff39b2d5159c8d 100644
GIT binary patch
delta 27
icmey**37;^j+xP7vOKdiCl><~0|Nsi1M6gaW(NRLodlWy

delta 23
ecmZo>|IfBTj+xP9vOKdiD;onN1H)uzW(NR62n34&

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectExpendController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectExpendController$2.class
index baec810f083a805c3b65784040bfc9cd2f73e37e..24583f957c604665abb01e0c907e2ebb7abbaedd 100644
GIT binary patch
delta 49
vcmZo-Z)4w}$gFC?zyyR03|v~;TY<!O2A+*T9uosUNDM5)$iO<;iP-@FxJw2@

delta 45
vcmZo;Z(`q|$gF6>zyyR03|v~;TY<!O2A+*T9uosUkYr<EWMG)=#_Rw9qErSn

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$1.class
index 7480d21a15c718b69e4e3c9a08a3e138ad84acd3..60e822b435638434a61efaa1092f8780d10bec0e 100644
GIT binary patch
delta 27
icmcb>euaHQJ~N}m<N{`CPA&!}1_lO32G+?Fm>mFO^#!m1

delta 23
ecmcb@et~^MJ~N}q<N{`CRyGDk28PK~m>mF7N(G?+

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$2.class
index 1db899c8c1dc5d7b67eb09e32d78456e90bd8ee0..1c61b2bc49177840e637aae2c3375d0cda5aa211 100644
GIT binary patch
delta 49
vcmdnYzMXwT5VNWU0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?VrB;b)2ast

delta 45
vcmdnazL|YP5VN8Q0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`yIkN)*yJrUY

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$3.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidProjectInfoController$3.class
index 72a2dc152768fa251202aa863ff53db68ab496a4..47362a0cf3db5ee0b44d1088b0eb32dcd3660ac9 100644
GIT binary patch
delta 49
vcmeyy{)>IXRAyBR1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&+n5~y`4<Qi

delta 45
vcmeyx{*8UZRAxmJ1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<aUCa&u-LMD*

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidRepaymentPlanController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidRepaymentPlanController$1.class
index c696013594d5941d512e1e0eb5126411dafef457..e64a5a7b3c022917b3a7c6866689dd972f39ab89 100644
GIT binary patch
delta 27
icmey**37;^j+xP7vOKdiCl><~0|Nsi1M6gaW(NRLodlWy

delta 23
ecmZo>|IfBTj+xP9vOKdiD;onN1H)uzW(NR62n34&

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidRepaymentPlanController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidRepaymentPlanController$2.class
index e0066216614c92ba916b3fd3d6b1741414b8ebdd..c5f811b3cb5b68dbbd54796fa92fac7d714af51a 100644
GIT binary patch
delta 49
vcmZo-Z)4w}$gFC?zyyR03|v~;TY<!O2A+*T9uosUNDM5)$iO<;iP-@FxJw2@

delta 45
vcmZo;Z(`q|$gF6>zyyR03|v~;TY<!O2A+*T9uosUkYr<EWMG)=#_Rw9qErSn

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidSchedulePlanController$1.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidSchedulePlanController$1.class
index 35ae69b57a5218ee653fb174a490b774b08e751d..64be93deba4788bbdd51e6fe75342e537d257fa4 100644
GIT binary patch
delta 49
vcmey)_M2^k7_+Jc0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnMXb7lts;m8LS

delta 45
vcmey(_ML5m7_*`Y0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3{dHM0W%$Xy2p

diff --git a/build/classes/com/sdry/web/controller/hpf/android/AndroidSchedulePlanController$2.class b/build/classes/com/sdry/web/controller/hpf/android/AndroidSchedulePlanController$2.class
index d63e6750f65d9d34b3146c9e10e81cc80b4e3b14..b53ea85a4781dd52ad3ceeb72e29f780b5dd399b 100644
GIT binary patch
delta 27
icmeyx_K$6YBr~JMWGQB8PA&!}1_lO32G+?|%nkruF9iSq

delta 23
ecmeyz_KR(UBr~JQWGQB8RyGDk28PLY%nkrd>;&-u

diff --git a/build/classes/com/sdry/web/controller/hy/CliLogController$1.class b/build/classes/com/sdry/web/controller/hy/CliLogController$1.class
index 956da4bb22a968611dcc9c6a090fdc162ecc32a1..79d589b4ea977e8452dbcb585fdc87348c2421be 100644
GIT binary patch
delta 49
vcmey$`jd6T6ed**1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&TbUdH_n!y}

delta 45
vcmey#`jvIV6edLz1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<aolFh@+*k+t

diff --git a/build/classes/com/sdry/web/controller/hy/DayLogController$1.class b/build/classes/com/sdry/web/controller/hy/DayLogController$1.class
index 8d2d67d4e64c0c665ec9f0b0743b197c0a5bf251..6e20f5d9620c3ecc29d5f8b82038f5af4086e852 100644
GIT binary patch
delta 27
icmaFQ`k8e@9}}a+<bEb;PA&!}1_lO32G+^znH&IZ%mzdN

delta 23
ecmey&`kr+|9}}a=<bEb;RyGDk28PL-nH&IGNd`3l

diff --git a/build/classes/com/sdry/web/controller/hy/ItemLogController$1.class b/build/classes/com/sdry/web/controller/hy/ItemLogController$1.class
index 8d1b0d876bf59da4393f6a51cca67263e5db1e5a..0e2f5f31090aa5108633a519b2471198d38d4698 100644
GIT binary patch
delta 49
vcmey)`kQsbG$vIG1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&+nF2y_`L`b

delta 45
vcmey(`ki&dG$ut81|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<a-AoPu-ChU+

diff --git a/build/classes/com/sdry/web/controller/hy/WorkPlanController$1.class b/build/classes/com/sdry/web/controller/hy/WorkPlanController$1.class
index 769cf9f4c075763b463659faef24355b8e2e3b80..3a85a6fa15e1271ef2a64ac1e6ba7c7c2c982962 100644
GIT binary patch
delta 50
ycmey&`<-`#IjgD#0}~K3FmP#UZ)M=o+RnhY5y)d=5Cn;VWf&P)H%G9}W&{B8iwENX

delta 46
ycmey)`<ZuxIjf=x0}~K3FmP#UZ)M=o+RnhY5y)d=5CoEJ42%p6n`2mKGXenERR`1n

diff --git a/build/classes/com/sdry/web/controller/hy/WorkPlanController$2.class b/build/classes/com/sdry/web/controller/hy/WorkPlanController$2.class
index 6b862087a858019c3a411d664be3a153a37154f5..8a7451cddcba0ee8724fed14313d51297b9fb04c 100644
GIT binary patch
delta 27
jcmey*+RV0L9uuR*<oQg}oLme{3=9m646Kv)GdTbNXG8`S

delta 23
fcmZo>`_H;z9uuR<<oQg}tZWR73=ESGGdTbNQ@;iV

diff --git a/build/classes/com/sdry/web/controller/lz/android/AndroidFinanceController$1.class b/build/classes/com/sdry/web/controller/lz/android/AndroidFinanceController$1.class
index b3f104d6509664062f5d937e09e823808b210f28..989bac7c7b82967128699ba226bca2d7ef4506ca 100644
GIT binary patch
delta 27
jcmey*-psLK9y6oG<oV3foLme{3=9m646Kv)GdlnPXU_&4

delta 23
fcmZqX_|Lv!9y6oK<oV3ftZWR73=ESGGdlnPR5At)

diff --git a/build/classes/com/sdry/web/controller/lz/android/AndroidFinanceController$2.class b/build/classes/com/sdry/web/controller/lz/android/AndroidFinanceController$2.class
index bb8dc88a3164ed83694df5164360733676981a6c..acd57d81c2d78cdef076f6282cb51eda6a5baf95 100644
GIT binary patch
delta 49
vcmey&{+)fpBxY3$1|}e6VBpfy-U=kPGw^H#@|YO-L1JJTMh4c&o0%N|_i6|S

delta 45
vcmey){+WHlBxXeu1|}e6VBpfy-U=kPGw^H#@|YO-fg~FPBLl<a?aU4U+$RV4

diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$1.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$1.class
index c70483ede6eefc6d917a0d97f3b834ed0603583a..1447ddf68985d50f8fc440ebb87e5f385cc4d678 100644
GIT binary patch
delta 27
icmcb|`iONyEfb@~<T@s4PA&!}1_lO32G+^*m>d9Sjs@=k

delta 23
ecmaFFdXIHOEfb^3<T@s4RyGDk28PLtm>d9A8wKD1

diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$2.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$2.class
index db1cba59de22d532290fe9ffb796c3ee11405e0f..2ead668adf009b3f78ecb8dedd122139b46e26d2 100644
GIT binary patch
delta 49
vcmaFN`kZw`6O*b10}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?#Y_$W?U4t;

delta 45
vcmaFP`j~Y?6O*C|0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3|IawZ1=(;^45

diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$3.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$3.class
index 94af9cf740a698a09a731be0d4d2c01b5f5f9513..bc4fd4fe3310ab9136a63efcbb4725c2be496fe2 100644
GIT binary patch
delta 49
vcmaFH`igZ!E0d}P0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?WlRnL?>-03

delta 45
vcmaFG`iyl$E0dxL0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3|IDkcX2)T;-+

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$1.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$1.class
index 80ce3da55cf2cbf71df81dc0471681a238a8fbf2..891a174ba4dabd782d10e6ee57c94ce61ac9cf4b 100644
GIT binary patch
delta 29
jcmdnav4?#_I5V#W0}~K3FmP#UZ)KQV$gDP*g~bQ}U{eL;

delta 172
zcmdnPzMW%3IJ1-q0}~K3FmP#UZ)M=JfdB;$S4Wr0Da>m1wh+LjwVi=yBTyL=13!>t
zV_;-pU<_dp0J3>NYz8hn2vA5WO3X{nP*BfJEG|hcQdh`NQ^+VODJZtm*H6zZNln#D
z&d=3PF3Kz}j;~7AcS<Zybt_8DP1OTRaxn-p2m#GvVGstAObj9nqLb$^D==~a03~xJ
APyhe`

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$2.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$2.class
index f9f816aec1322da8aa5465be3000613f52330196..5e41b5fe1168cd859d0c4ace99d212008ffe1f96 100644
GIT binary patch
delta 29
jcmdnVv5$R2Br~rC0}~K3FmP#UZ)KQV%&az<jl~E6VFv~7

delta 172
zcmdnTzLR4^B(szW0}~K3FmP#UZ)M=JfdB;$S4Wr0Y0PT%wh+LjwVi=yBTyL=13!>t
zV_;-pV4TDt0A%xk*bH2D5TKA$l$e*Cp`f0dSX`1?q^^*krjSumQc!HAub-Y-lA5ZQ
zoS&<oT$EW{9AA~J@03`a>Q<DPo2mzt<YEwH5CWRT!XOMJnHWSEL?_Q<R$$};07LgB
Am;e9(

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$3.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$3.class
index 2eac112271089c10a70d7f14394583deab6662e0..789e905c627c60a3643c2ff313035eb20a0207df 100644
GIT binary patch
delta 28
icmdnYv4ed>Ff*?O0}~K3FmP#UZ)KRA%d9qu#RvddP6f{Z

delta 172
zcmdnNzL{e~Ftd~i0}~K3FmP#UZ)M=JfdB;$S4Wr03CwEswh+LjwVi=yBTyL=13!>t
zV_;-pU_8$t0A%xk*bH2D5TKA$l$e*Cp`f0dSX`1?q^^*krjSumQc!HAub-Y-lA5ZQ
zoS&<oT$EW{9AA~J@03`a>Q<DPo2mzt<YEwH5CWRT!XOMJnHWSEL?_Q+R$$};08P3j
Aw*UYD

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$4.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$4.class
index 6e256e790d93210b6a35cdd712990f26636c1dd3..973e49af2787516eeb6c04029eb125946ea14556 100644
GIT binary patch
delta 29
jcmdnZae#e8G&8RS0}~K3FmP#UZ)KQV%B(h-gT)8{VY>zR

delta 172
zcmX@WzMEr1G_#Zm0}~K3FmP#UZ)M=JfdB;$S4Wr08O&<+wh+LjwVi=yBTyL=13!>t
zV_*a_c^CwMY#tDsfy)j86q1S(^O7?Z)N>PyOHzx}74p**GD=DcimmkZ(=$s_Q}vSb
ybM=#pGK-7jtCIDd5{pyaiV|~E^?;IG41x?oK(kmFgn=Xzg9wA@<OR$Mj9dT`fh8RP

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$5.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$5.class
index c8ffc5c48682a2af018ad171a580d3b79185588c..2f827ff63f8ac53a973b8db6cb9764db2c0f6412 100644
GIT binary patch
delta 29
jcmdnZae#e8G&8RS0}~K3FmP#UZ)KQV%B(h-gT)8{VY>zR

delta 172
zcmX@WzMEr1G_#Zm0}~K3FmP#UZ)M=JfdB;$S4Wr08O&<+wh+LjwVi=yBTyL=13!>t
zV_*a_JsAXmY#tDsfy)j86q1S(^O7?Z)N>PyOHzx}74p**GD=DcimmkZ(=$s_Q}vSb
ybM=#pGK-7jtCIDd5{pyaiV|~E^?;IG41x?oK(kmFgn=Xzg9wA@<OR$Mj9dUKh9z16

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$6.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$6.class
index 552b01b8ed5d692f47efbc5357bb426fd343bbca..be4a46d8dd90bf5b50d115827bdb3f0429167329 100644
GIT binary patch
delta 29
jcmdnVv5$R2Br~rC0}~K3FmP#UZ)KQV%&az<jl~E6VFv~7

delta 172
zcmdnTzLR4^B(szW0}~K3FmP#UZ)M=JfdB;$S4Wr0Y0PT%wh+LjwVi=yBTyL=13!>t
zV_*a_+ZY6ZY#tDsfy)j86q1S(^O7?Z)N>PyOHzx}74p**GD=DcimmkZ(=$s_Q}vSb
ybM=#pGK-7jtCIDd5{pyaiV|~E^?;IG41x?oK(kmFgn=Xzg9wA@<ax{rj9dUebtR1e

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$7.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$7.class
index 3e4b66176b7f3bac2ccbf0873918318799d2d94d..2102eed2f8e4a84966c647ac8d6468f2143a41fa 100644
GIT binary patch
delta 29
jcmey#{*P^gBr~rC0}~K3FmP#UZ)KQl%&a!~7_$)oX-@{L

delta 172
zcmeyz_LF^sB(szW0}~K3FmP#UZ)M=JfdB;$S4Wr0YRqc&wh+LjwVi=yBTyL=13!>t
zV_*a_FEa=L**qXN1D72HC?pjn<|St+sOKgYm!uY{E99psWR#Q?6kF-*r)QR=rs^f<
y=jtaHWfm95S0(E^B^IZ;6(#1T>H#IW7z7!FfM&5U2m?tb1`!6)$#KjIj9dU^_9d7A

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$8.class b/build/classes/com/sdry/web/controller/zc/android/AndroidApplyController$8.class
index ca16f8f1fde1fce40f4d96ac51fd7788447aa6e8..4ee69ca9da521c6bff146f4a515ab80341a58f99 100644
GIT binary patch
delta 29
jcmeyv-pIZ|hMCubfe8p17`U{ww=zsNV^*7dlGz9VT=xb$

delta 153
zcmZo<|HHmPhFQvlfe8p17`U{ww=!_qK!AdWtE0<gO=h(mTL|FN+RnhU5vYubfgeb+
zF)#v|Zy5xDY#tDsfy)j86q1S(^O7?Z)N>PyOHzx}74p**GD=DcimmkZ(=$s_Q}vSb
hbM=#pGK-7jtCIDd5{pyaiV|~E^?;I-{g{mzxd3f6B)|Xw

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$1.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$1.class
index 8985aaabbab8165893f6677f6a883f59e4e08e1a..51fe5fab3ce3ca5b0a1f4ec1cc7e2dfb27a2feaa 100644
GIT binary patch
delta 49
vcmZ3=zLI@|3$v;P0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?RAvVN%h(3b

delta 45
vcmZ3<zLb4~3$vmL0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`yCbI(ov^@sE

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$2.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$2.class
index 53423aa6787fdd275409ff958eb61914fec53c1d..3faab5a0e320cfba8c55757dced8db79567fe61e 100644
GIT binary patch
delta 49
vcmZ3?zMOr76SJxX0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?WM&5d%DM)}

delta 45
vcmZ3^zL<T36SJZT0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`yI<o@+vo{8~

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$3.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$3.class
index e320a846fbbe894dd053b960ea6f0e20284e16e8..60a2b99eb2e0e4813fd808a42ada585286b5cc86 100644
GIT binary patch
delta 49
vcmZ3^zM6f58?&kf0}~K3FmP#UZv_(D8F)4Vc}xuaATh8EBLnN?bY=$t%=QM?

delta 45
vcmZ3@zMOr78?&Mb0}~K3FmP#UZv_(D8F)4Vc}xuaK$4Atk%3`yHnRf&wL=ET

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$4.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$4.class
index a5f3ad0174a613670155a53e2c365fcfdccadfab..f97ec9797ff06df112f9a9a443e1c0c24ea2bd85 100644
GIT binary patch
delta 27
icmZ3_zL|Z4A2XxHWPfI9PA&!}1_lO32G+^>%nkrn*98jz

delta 23
ecmdnYzMg%9A2XxLWPfI9RyGDk28PMS%nkrYJOumz

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$5.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$5.class
index ae210ebff03768c1a405a6492b80994dda3c1e39..0108ed3be6e2497774215fe180090f9b197fece0 100644
GIT binary patch
delta 27
icmZ3_zL|Z4A2XxHWPfI9PA&!}1_lO32G+^>%nkrn*98jz

delta 23
ecmdnYzMg%9A2XxLWPfI9RyGDk28PMS%nkrYJOumz

diff --git a/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$6.class b/build/classes/com/sdry/web/controller/zc/android/AndroidManageBudgetController$6.class
index 1547a2501a321f57e4e13f235cdfa5527064f77e..6dd5999be327f6ff7737e0f1f34643abde874a18 100644
GIT binary patch
delta 27
icmdnUzLkAL05hY-<UnR=PA&!}1_lO32G+@i%nkrolLZw3

delta 23
ecmdnWzL9-H05hY><UnR=RyGDk28PL{%nkrY*aZdv

diff --git a/src/com/sdry/service/tdd/StaffServiceImpl.java b/src/com/sdry/service/tdd/StaffServiceImpl.java
index a0440ca..c1ae959 100644
--- a/src/com/sdry/service/tdd/StaffServiceImpl.java
+++ b/src/com/sdry/service/tdd/StaffServiceImpl.java
@@ -171,12 +171,4 @@ public class StaffServiceImpl implements StaffService{
 	/**
 	 * ****************************************end*************************************
 	 */
-	
-	
-	
-	
-	
-	
-	
-	
 }
diff --git a/src/com/sdry/web/controller/cb/UserController.java b/src/com/sdry/web/controller/cb/UserController.java
index 63a46e9..4258327 100644
--- a/src/com/sdry/web/controller/cb/UserController.java
+++ b/src/com/sdry/web/controller/cb/UserController.java
@@ -47,10 +47,6 @@ public class UserController{
      	* 登陆
      */
     @RequestMapping("/loginToke")
-    public String loginToke(HttpServletRequest request) throws IOException {
-        /*request.getSession().setAttribute("staff", staff);*/
-        return "index";
-    }
     @ResponseBody
     public ModelAndView loginToke(HttpSession httpSession,HttpServletRequest request) throws IOException {
     	ModelAndView mav = new ModelAndView();
@@ -79,11 +75,40 @@ public class UserController{
 			httpSession.setAttribute("menuList", selectAllMenuList);
 			mav.setViewName("index");
 		}
+		mav.addObject("type", 0);
         return mav;
     }
     @RequestMapping("/loginToke1")
-    public String loginToke1(HttpServletRequest request) throws IOException {
-        return "index1";
+    @ResponseBody
+    public ModelAndView loginToke1(HttpSession httpSession,HttpServletRequest request) throws IOException {
+    	ModelAndView mav = new ModelAndView();
+    	Staff staff = (Staff) httpSession.getAttribute("staff");
+    	List<ZcSysRoleEntity> roleList = staff.getZcSysRoleEntity();
+    	Map<Long,Object> pMap = new HashMap<>();
+    	String permissionId ="";
+    	for (ZcSysRoleEntity zcSysRoleEntity : roleList) {
+    		List<ZcPermissionEntity> pList = staffService.selectPermissionByRoleId(zcSysRoleEntity.getId());
+    		for (ZcPermissionEntity zcPermissionEntity : pList) {
+    			permissionId += zcPermissionEntity.getId()+",";
+			}
+		}
+    	String strWhere = "";
+    	ZcGeneralQueryEntity zcGeneralQueryEntity = new ZcGeneralQueryEntity();
+    	if(permissionId.length() !=0){
+			permissionId = permissionId.substring(0,permissionId.length() - 1);
+			//System.out.println(permissionId);
+			strWhere = "status = 0 and isdel = 0 and id in ("+ permissionId+") and ";
+		}else{
+			strWhere = "status = 0 and isdel = 0 and id in ("+ 0+") and ";
+		}
+		zcGeneralQueryEntity.setStrWhere(strWhere);
+		List<ZcPermissionEntity> selectAllMenuList = zcSystemService.selectAllMenuList2Index(zcGeneralQueryEntity);
+		if(selectAllMenuList.size()>0){
+			httpSession.setAttribute("menuList", selectAllMenuList);
+			mav.setViewName("index1");
+		}
+		mav.addObject("type", 1);
+        return mav;
     }
     @RequestMapping("/destroy")
     public String destroy(HttpServletRequest request) {
-- 
Gitee