Merge branch 'pre' into 'master'

修改candy 使用券 uid费必传

See merge request !181

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

@@ -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();