Merge branches 'newProperty' and 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_web into rongxin_dev

 Conflicts:

	static/js/api/user.js

	static/js/project/user/index.js

view/user/user.html

@@ -775,23 +775,19 @@
                     <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent">
                         <!-- <script id="listHistoryData" type="text/html">
                             <tr>
-                                <td>活动名称</td>
-                                <td>办理人ID</td>
-                                <td>办理人</td>
+                                <td>批次号</td>
+                                <td>审批节点</td>
+                                <td>审批人</td>
                                 <td>审批意见</td>
-                                <td>开始时间</td>
-                                <td>结束时间</td>
-                                <td>耗时</td>
+                                <td>审批时间</td>
                             </tr>
                             {{each listHistory as value i}}
                             <tr>
-                                <td>{{value.activityName}}</td>
-                                <td>{{value.assignee}}</td>
-                                <td>{{value.assigneeName}}</td>
-                                <td>{{value.comment}}</td>
-                                <td>{{value.startTime}}</td>
-                                <td>{{value.endTime}}</td>
-                                <td>{{value.durationInMillis}}</td>
+                                <td>{{value.auditbatchNo}}</td>
+                                <td>{{value.nodeName}}</td>
+                                <td>{{value.auditBy}}</td>
+                                <td>{{value.auditRemark}}</td>
+                                <td>{{value.auditTime}}</td>
                             </tr>
                             {{/each}}
                         </script> -->