Merge branch 'developer'

姜友瑶

2022-06-13 6e35192ad8eb1f93a831fc6888e874344ecfd4eb

 zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java

@@ -32,7 +32,7 @@

    @RequestMapping(value = "/showAllList")
    public @ResponseBody
    AjaxResult showAllList(ServiceRecord serviceRecord, PaginationVO pageVo) {
    AjaxResult  showAllList(ServiceRecord serviceRecord, PaginationVO pageVo) {

        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
            serviceRecord.setShopId(getMe().getShopId());