Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 service-store/src/main/java/com/java110/store/api/StoreStaffApi.java

old mode 100644
new mode 100755
@@ -48,14 +48,14 @@
    public ResponseEntity<String> getPropertyStaffs(@RequestParam(value = "page") int page,
                                                 @RequestParam(value = "row") int row,
                                                 @RequestParam(value = "storeId", required = false) String storeId,
                                                 @RequestParam(value = "roleCd", required = false) String roleCd
                                                 @RequestParam(value = "relCd", required = false) String relCd
    ) {
        StoreUserDto storeUserDto = new StoreUserDto();
        storeUserDto.setPage(page);
        storeUserDto.setRow(row);
        storeUserDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
        storeUserDto.setStoreId(storeId);
        storeUserDto.setRelCd(roleCd);
        storeUserDto.setRelCd(relCd);
        return getStoreStaffBMOImpl.getStoreStaffs(storeUserDto);
    }