Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java

@@ -10,16 +10,16 @@
 */
@AllArgsConstructor
public enum DataSourceType {
   /**
    * 主库
    */
   MASTER("master"),
    /**
     * 主库
     */
    MASTER("master"),

   /**
    * 从库
    */
   SLAVE("slave");
    /**
     * 从库
     */
    SLAVE("slave");

   @Getter
   private final String source;
    @Getter
    private final String source;
}