积分明细页调整

happy-job-base-system/src/main/webapp/webpage/modules/jfmanager/mpPointsDetailList.js

@@ -102,7 +102,7 @@ $(document).ready(function() {
 		    }
 			,{
 		        field: 'pointType',
-		        title: '变动原因',
+		        title: '积分方式',
 		        sortable: false,
 		        sortName: 'pointType',
 		        formatter:function(value, row , index){
@@ -110,6 +110,19 @@ $(document).ready(function() {
 		        }
 		       
 		    }
+		   ,{
+			   field: 'adjustReason',
+			   title: '变动原因',
+			   sortable: false,
+			   sortName: 'adjustReason',
+			   formatter:function(value, row , index){
+				   if(value){
+					   return value;
+				   }
+				   return "-";
+			   }
+
+		   }
             ,{
                  field: 'pointsTime',
                  title: '时间',

happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/hpUserForm.jsp

@@ -110,7 +110,7 @@
 								<div class="col-sm-7">
 										${hpMember.mpMemberAccountF.moneyBalance!= null?hpMember.mpMemberAccountF.moneyBalance:0}&nbsp;&nbsp;&nbsp;&nbsp;
 										<shiro:hasPermission name="moneymanager:mpMoneyDetail:detail">
-										<a onclick="moneyDetail(${hpMember.id})">余额明细</a>
+										<a onclick="moneyDetail(${hpMember.id})">钱包明细</a>
 										</shiro:hasPermission>
 								</div>
 							</div>