Selaa lähdekoodia

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

liliang4869 7 vuotta sitten
vanhempi
commit
cd3bdc413b

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -784,7 +784,7 @@
 		select
 			count(0)
 		from demand a left join user b on a.employer_id = b.id 
-		where a.deleted_sign = 0
+		where a.info_sources=1
 		<if test="employerId != null">
 			and a.employer_id = #{employerId,jdbcType=VARCHAR}
 		</if>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -40,7 +40,7 @@
 						alt="" />
 			</div>
 			<div class="collection">
-            	 <p><span th:class="${interested}==null?'heart':'heart active'"></span><span>收藏</span></p>
+            	 <p><span th:class="${interested}==null?'heart':'heart active'"></span><span>关注</span></p>
        		</div>
 		</div>
 		<div class="basc_p">