Merge branch 'master' of http://116.63.33.55/git/dt2

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SystemRiskServiceImpl.java

@@ -226,7 +226,7 @@ public class SystemRiskServiceImpl implements SystemRiskService {
             Map<String, Object> resultMap = new HashMap<>();
             Map<String, Object> timeMap = new HashMap<>();
             Integer createYear = calendar.get(Calendar.YEAR);
-            Integer createMonth = calendar.get(Calendar.MONTH)+1==0?12:calendar.get(Calendar.MONTH+1);
+            Integer createMonth = calendar.get(Calendar.MONTH)+1==0?12:calendar.get(Calendar.MONTH)+1;
             timeMap.put("createYear", createYear);
             timeMap.put("createMonth", createMonth);
             if(Blank.isNotEmpty(orgType)){

spring-cloud/server-page/src/main/resources/static/page/safetyInforManager.html

@@ -51,7 +51,7 @@
 					</div>
 				</div>
 				<div class="layui-btn-container">
-					<button class="layui-btn layui-btn-sm timeBtn" ><span class="iconfont">&#xe607;</span>确定</button>
+					<button class="layui-btn layui-btn-sm timeBtn" >确定</button>
 				</div>
 				<table class="layui-hide" id="safetyInfoTable" lay-filter="safetyInfoTable"></table>
 				<!--安全信息表头按钮-->