Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -334,6 +334,9 @@
             <if test="stationDTO.publicFlag != null and stationDTO.publicFlag != ''">
                 and t1.public_flag = #{stationDTO.publicFlag,jdbcType=VARCHAR}
             </if>
+            <if test="stationDTO.merchantId != null and stationDTO.merchantId != ''">
+                and t1.merchant_id = #{stationDTO.merchantId,jdbcType=VARCHAR}
+            </if>
             <!-- 数据范围过滤 -->
             <if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">
                 and t3.dept_id in

jsowell-ui/vue.config.js

@@ -35,9 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
         // 更改代理为本地地址
-        target: `http://192.168.2.6:8080`,
+        // target: `http://192.168.2.6:8080`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",