Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

liurunyu

2024-08-09 d562b35ec9d09979971066ba9c07ec8576f9a45e

Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV

 pms-parent/pms-global/src/main/resources/init-config.xml

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
    <user name="超级管理员" phone="admin" password="admin" supperAdmin="1" />
    <user name="超级管理员" phone="admin" password="ABC123" supperAdmin="1" />
</config>

 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml

@@ -76,7 +76,7 @@
    select
      count(*)
    from ba_user
    where supper_admin!=1 and deleted!=1
    where  deleted!=1
  </select>
  <select id="login" resultMap="loginResultMap" >
    select

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java

@@ -80,7 +80,7 @@
                        String num = ele.getAttributeValue("num") ;
                        String name = ele.getAttributeValue("name") ;
                        String type = ele.getAttributeValue("type") ;
                        String typeName = ele.getAttributeValue("type_name") ;
                        String typeName = ele.getAttributeValue("typeName") ;
                        this.savePrivilege(num, name, type,typeName);
                    }
                }

 pms-parent/pms-web-station/pom.xml

@@ -211,12 +211,6 @@
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
        </dependency>
        <dependency>
            <groupId>com.dy</groupId>
            <artifactId>pms-web-product</artifactId>
            <version>1.0.0</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

    <build>