Merge branch 'master' into google

wjc

3 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

 app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java

@@ -147,6 +147,8 @@
        en.setTitle("English");
        en.setLanguage(LocalManageUtil.en);
        list.add(en);


        return list;
    }