Merge remote-tracking branch 'origin/master'

zengh

2021-09-10 3b1bba4cae03694d1364115b9cd539bee066ce7e

 src/main/java/org/springblade/modules/licetuser/controller/LicetuserController.java

@@ -66,7 +66,7 @@
   @PostMapping("/liceUp")
   @ApiOperationSupport(order = 1)
   public R liceUp(@Valid @RequestBody Licetuser licetuser) {
      Map map = licetuserService.liceIn(licetuser.getUserid());
      Map map = licetuserService.liceIn(licetuser.getUserid(),licetuser.getPtype());
      if (map==null){
         licetuserService.save(licetuser);
      }