소스 검색

Merge branch 'master' of jishutao/jitao-server into test

liliang4869 7 년 전
부모
커밋
4e9f6c0907
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml
  2. 2 2
      src/main/webapp/WEB-INF/views/common.html

+ 2 - 2
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -526,7 +526,7 @@
  and jtbc.id=jtbp.category_id
   </if>
   <if test="ownerId!=null">
-  jdbp.owner_id=#{ownerId,jdbcType=VARCHAR}
+  and jdbp.owner_id=#{ownerId,jdbcType=VARCHAR}
   </if>
   	<if test="page_sql!=null">
 		${page_sql}
@@ -550,7 +550,7 @@
  and jtbc.id=jtbp.category_id
   </if>
     <if test="ownerId!=null">
-  jdbp.owner_id=#{ownerId,jdbcType=VARCHAR}
+  and jdbp.owner_id=#{ownerId,jdbcType=VARCHAR}
   </if>
   </select>
   

+ 2 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -296,12 +296,12 @@
 					<div class="password_center">
 						<div >
 							<label for="new_pass">
-								新密码:<input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..."/>
+								新密码:<input type="password" name="type" id="new_pass" placeholder="请输入您的新密码..."/>
 							</label>
 						</div>
 						<div >
 							<label for="new_pass_again">
-								确认密码:<input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..."/>
+								确认密码:<input type="password" name="type" id="new_pass_again" placeholder="请确认您的密码..."/>
 							</label>
 						</div>
 						<div class="fastener">