From 6290f5c168f8f9d8d3d082e7402ef89d835ab83a Mon Sep 17 00:00:00 2001 From: zhangqiyang <1066386929@qq.com> Date: Mon, 1 Jan 2024 11:03:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/resources/application.properties --- .../6.3/executionHistory/executionHistory.bin | Bin 2304669 -> 2304669 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/6.3/fileHashes/fileHashes.bin | Bin 137833 -> 137833 bytes .gradle/6.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../6.3/fileHashes/resourceHashesCache.bin | Bin 19551 -> 19619 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes out/production/resources/AccessInterface.yml | 4 ++-- .../resources/application.properties | 2 +- src/main/resources/AccessInterface.yml | 3 ++- 9 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gradle/6.3/executionHistory/executionHistory.bin b/.gradle/6.3/executionHistory/executionHistory.bin index 5277a24c0f5cf42a03fb0dec2969fcc6e4001347..616982247b1a2a4ab3116147dd77b6545b9e33ac 100644 GIT binary patch delta 1276 zcmbPxwTE#o5N}BEQOYSXHZRD?&n>7*&do{B%`eZ*$TO)hD=SK5fPjL@=X|U;@AcWq zC^Yl6!i%kC`&8FxFJ@g_%2doaWpbjQ@aEZm>MR2Kar=edM>OQ!|8we+{*?Q>CM$aD zPB%EtD>PX!c$omY&gmDs7-gp)(Bo8^-fyKCx;Z+eomGG@dKRbKg!vuw)pMV<&pH0B z`BUWfPmzo^sstU$TiG5^&$vCHo@rJvLB-4tlM6izr`KO*5@`3m%ml>DK+FQftlNDr zv+X%d&;*7OXqW^rwr`uk4#XTl%n8I?K+FxqJlnU;;N>UmaAqF3Tc!iu61+Xmouh(z zy1bdF-Sii?n7X&`ImD~ZP0&GXx2F{fx^4eoAgIT(z48*TvXFq8uKfj051B=C!=xvw z%H4Q3z3>UI=Jcyic(pL49OD@!rb|rY^WI+cly~|p6@qEPm0`{Fh0M&N)9r6da&Gr- z;Cm)4py#Ffna}<)^QYzo=Q8uNmQ8n@!dHzU+J0sV9}x3zKQl$(^lic(+XVAi7T0w9 zxk5>sb#tWnC-)ZxPp_LMB)r|bTksa6fW+phe_7|I_-&S-&*rc<4P)zzpC9@h_3+Dd#R$P*Owoh6 zd=lHQxH0l6Z{IXkNS94OJH_7IXF^-C=#_2U%fH>W0$Cl3DS9!HQM^5Sjt~$F1F;AY zivqD25QD@efLIcUrGQu(h-J2C&yoFcn_xtEKY~WYc3?#4a^T3Ipe&ZN{qJK*Rp#yW zEpoMwF>>1E!W^;bA2Q^5w(Dic-(bOrwdo(%vf504&?}=f{mwe(i0!^!N(uL;pIi?;(U=3&9GZTo6FMMXwTOBSqR%>$Y5-agSmar;CErEeUViZETW=e_`U h3d3uIlsEUTIl851NLHFpzgRApFN!Y8$iTA61ptKY0gC_t delta 1345 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 RyDi$k*I8vQxqPLQ{|PKI06_o% delta 5678 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 diff --git a/.gradle/6.3/fileHashes/fileHashes.lock b/.gradle/6.3/fileHashes/fileHashes.lock index b485b54745c5ba3b254e948feeba1079e0432a1d..cb19b90485a021237e985a7c868c307dedb3d187 100644 GIT binary patch literal 17 UcmZRU$;l1tI3iZV00wdH04K8p(f|Me literal 17 UcmZRU$;l1tI3iZV00xmq04OE|N&o-= diff --git a/.gradle/6.3/fileHashes/resourceHashesCache.bin b/.gradle/6.3/fileHashes/resourceHashesCache.bin index da79c96f15770b4b7b084d1ab21cdbe7e3cb0c9a..5f36576287ef85dcbd12317dafd986de1817a0f2 100644 GIT binary patch delta 81 zcmcaVgK_ap#tkMCjEa*@B|P~Hf37*Q_Q)0nFz{*ITq;q)Bv7=(`CIro7ayo-{N$%n cPE5?28x?