Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -657,15 +657,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 	}
 
 	/**
-	 * 接收处理ekp订单回复
-	 *
-	 * @author licancan
-	 * @return {@link R}
-	 * @throws IOException
-	 */
+	 * @Author fxj
+	 * @Description 附件上传
+	 * @Date 9:38 2023/6/26
+	 * @Param
+	 * @return
+	**/
 	@Override
 	public void receiveOrderNew(InputStream inputStream, String file1, String orderNo, String fileName, String originalFileName){
-		R<Object> e;
 		if (file1.equals("fileOne")) {
 			getObjectR(inputStream, orderNo, fileName, originalFileName,CommonConstants.TWO_INTEGER);
 		}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -319,6 +319,7 @@ public class TPaymentInfoController {
 	 * @author huyc
 	 * @date 2022-10-31
 	 **/
+	@SysLog("缴费库合并导出")
 	@Operation(description = "合并导出缴费库 hasPermission('social_tpaymentinfo_export')")
 	@PostMapping("/sumExport")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")