Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1175,7 +1175,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
      * @param userSid
      * @return
      */
-    public ResultBean cashierConfirm(String sid, String userSid) {
+    public ResultBean cashierConfirm111(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
@@ -1951,7 +1951,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     }
 
     //备份
-    public ResultBean cashierConfirm111(String sid, String userSid) {
+    public ResultBean cashierConfirm(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {