Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ShareACollectionController.java

@@ -9,6 +9,7 @@
import javax.annotation.Resource;

@RestController
@RequestMapping("/SAndC")
public class ShareACollectionController {

    @Resource