Merge branch 'dev' into feature-201845-wangcz

# Conflicts:
#	src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

src/main/java/com/uas/platform/b2c/prod/commodity/model/CommodityInOutbound.java

@@ -323,12 +323,12 @@ public class CommodityInOutbound implements Serializable {
             this.enuu = user.getEnterprise().getUu();
             this.enName = user.getEnterprise().getEnName();
         } else {
-            this.enuu = SystemSession.getUser().getUserUU();
-            this.enName = SystemSession.getUser().getUserName();
+            this.enuu = user.getUserUU();
+            this.enName = user.getUserName();
         }
         this.createTime = new Date();
-        this.operaterUseruu = SystemSession.getUser().getUserUU();
-        this.operaterUserName = SystemSession.getUser().getUserName();
+        this.operaterUseruu = user.getUserUU();
+        this.operaterUserName = user.getUserName();
     }
 
 

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -732,7 +732,7 @@
             </div>
           </td>
           <td ng-if="check.totalCount.length === 0">-</td>
-          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
+          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账明细</td>
         </tr>
         </tbody>
 

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -732,7 +732,7 @@
                   </div>
               </td>
               <td ng-if="check.totalCount.length === 0">-</td>
-            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
+            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账明细</td>
           </tr>
         </tbody>