Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -171,7 +171,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 		
 		studentPaymentRouteOrder.setUpdateBy(operatorId);
 		studentPaymentRouteOrder.setUpdateTime(nowDate);
-		studentPaymentRouteOrder.setMemo(memo);
+		studentPaymentRouteOrder.setAuditComment(memo);
 		studentPaymentRouteOrder.setAuditStatus(auditStatus);
 		
 		studentPaymentRouteOrderDao.update(studentPaymentRouteOrder);

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -126,9 +126,6 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('routeOrder/add')")
     public HttpResponseResult<StudentPaymentRouteOrder> add(@RequestBody StudentPaymentRouteOrder studentPaymentRouteOrder) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (studentPaymentRouteOrder.getUserId() == null) {
-            studentPaymentRouteOrder.setUserId(sysUser.getId());
-        }
         if (studentPaymentRouteOrder.getServiceAmount() == null) {
         	studentPaymentRouteOrder.setServiceAmount(BigDecimal.ZERO);
         }