fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java

@@ -41,4 +41,10 @@
     * 登录账户密码错误次数 redis key
     */
    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";


    public static final String BILL_UPDATE_LOCK_KEY = "bill_update_lock:";


    public static final String COMPLETE_PAY_LOCK_KEY = "complete_pay_lock:";
}