Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-03-13 d8085c81987d5819d7f270bcf0bd68d879f28d2b

 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>