Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 src/main/java/com/moral/controller/ProfessionController.java

@@ -9,6 +9,7 @@

import javax.annotation.Resource;
import java.util.List;
import java.util.Optional;

@RestController
@RequestMapping("profession")
@@ -16,7 +17,8 @@
      @Resource
      ProfessionService professionService;
      @GetMapping(value = "getall")
     public ResultBean<List<Profession>> getALL(){
          return  new ResultBean<>(professionService.getProfessiontList());
     public ResultBean<List<Profession>> getALL(Optional<String> name){
          String queryName = name.isPresent()?name.get():null;
          return  new ResultBean<>(professionService.queryByName(queryName));
      }
}