Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantInfoWrapper.java

@@ -83,9 +83,6 @@ public class TenantInfoWrapper {
         @ApiModelProperty("id")
         private long id;
 
-        @ApiModelProperty("机构ID")
-        private Long tenantId;
-
         @ApiModelProperty("机构名称")
         private String name;
 
@@ -146,6 +143,9 @@ public class TenantInfoWrapper {
 
         @ApiModelProperty("更新时间")
         private Date updateTime;
+
+        @ApiModelProperty("启用/冻结")
+        private Boolean enableFlag;
         
         public String jsonString() {
             return JSON.toJSONString(this);

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumPurchaseController.java

@@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 
 @Slf4j
 @Validated
@@ -42,7 +44,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     @Autowired
     private TenantAlbumPurchaseService tenantAlbumPurchaseService;
 
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
     @Autowired