Merge remote-tracking branch 'origin/master'

NNowhZzU

2023-12-29 7fdc69ac6e262f7e203131c36cc4fbf2012f9e03

 north-glass-erp/.idea/google-java-format.xml

New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="GoogleJavaFormatSettings">
    <option name="enabled" value="false" />
  </component>
</project>