记得上下班打卡 | git大法好,push需谨慎

Commit bd3fc0d8 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/hjc' into hjc

parents fe6460d2 f75581b1
......@@ -263,7 +263,7 @@ public class CandyCouponController {
@RequestParam("performanceId") @NotNull @NotBlank String performanceId,
@RequestParam("timeId") @NotNull @NotBlank String timeId,
@RequestParam("ticketId") @NotNull @NotBlank String ticketId,
@RequestParam(value = "uid", required = false) @NotNull @NotBlank String uid
@RequestParam(value = "uid", required = false) String uid
) {
if (uid == null) {
uid = CurrentUtil.getCurrentUid();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment