Przeglądaj źródła

Merge remote-tracking branch 'origin/test'

limin 7 lat temu
rodzic
commit
4ca38e2ef3

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

@@ -204,7 +204,7 @@
       contacts, email, professional_title, 
       work_unit, education, major_category, 
       qualification, graduate_school, 
-      consultation_price)
+      consultation_price,consultant_type)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
@@ -218,7 +218,7 @@
       #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, 
       #{workUnit,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, #{majorCategory,jdbcType=VARCHAR}, 
       #{qualification,jdbcType=VARCHAR}, #{graduateSchool,jdbcType=VARCHAR}, 
-      #{consultationPrice,jdbcType=DECIMAL})
+      #{consultationPrice,jdbcType=DECIMAL},#{consultantType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity">
     <!--

+ 1 - 2
src/main/java/com/goafanti/news/service/PolicyService.java

@@ -155,8 +155,7 @@ public Pagination<PolicyResult>searchPolicy(String title,Integer auditStatus,Str
 @SuppressWarnings("unchecked")
 public Pagination<AppDiscoveryBo> appListPolicy(Integer pageNo, Integer pageSize) {
 	Map<String, Object> params = new HashMap<>();
-	Pagination<AppDiscoveryBo>p=(Pagination<AppDiscoveryBo>) findPage("findPolicyAppList","findPolicyAppCount",params, pageNo, pageSize);
-	return p; 
+	return (Pagination<AppDiscoveryBo>) findPage("findPolicyAppList","findPolicyAppCount",params, pageNo, pageSize);
 }
 
 public PolicyResult policyDetail(String id) {