Merge remote-tracking branch 'origin/master'

guyue

4 天以前 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysIntegralMapper.java

@@ -6,5 +6,5 @@

public interface SysIntegralMapper extends BaseMapper<SysIntegral> {

    SysIntegral query(@Param("companyId") Integer companyId);
    SysIntegral query(@Param("openCityId") Integer openCityId);
}