Merge branch 'dev1'

Administrator

2018-12-25 4fa67c8de0fe4c3726a0b84db38316568768506c

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -24,6 +24,8 @@


   public final static String UIDAESKEY = "WW782ss@8*px/%2v";



   public final static String ADMINH5_AESKEY = "WW782Ss@0*px/,2v";



   public final static String RANDKEY = "user_randkey";

   public final static String RANDPWDKEY = "user_pwd_randkey";