From 1f9fce626038ab8378f201677afa7df07188c4b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 17:33:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java            |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java        |   10 +++--
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java         |    2 
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml                    |   22 ----------
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java      |    1 
 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml                    |    1 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java |    8 ++--
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java                   |    4 +-
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java          |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java            |    4 +-
 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml               |   39 ++++++++++++++++++-
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java                  |    1 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java         |   12 ++---
 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml                       |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java              |    7 +--
 15 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
index ea350ac..d386eec 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
@@ -25,7 +25,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_app_user_sign")
 @ApiModel(value="TAppUserSign对象", description="")
-public class TAppUserSign extends BasePojo {
+public class TAppUserSign implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 0d8fb3e..23c8fc9 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -7,9 +7,7 @@
 import com.ruoyi.order.api.query.TActivityStatisticsQuery;
 import com.ruoyi.order.api.vo.TActivityVO;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -20,16 +18,16 @@
 @FeignClient(contextId = "OrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = OrderFallbackFactory.class)
 public interface OrderClient {
 
-    @PostMapping("/t-exchange-order/getSalesCountByGoodsIds")
-    R<List<Integer>> getSalesCountByGoodsId(String goodsIds);
+    @GetMapping("/t-exchange-order/getSalesCountByGoodsIds/{goodsIds}")
+    R<List<Integer>> getSalesCountByGoodsId(@PathVariable("goodsIds") String goodsIds);
 
     /**
      * 管理后台 根据t_app_coupon订单购买或者兑换优惠券的订单编号
      * @param goodsIds  订单号-商品类型
      * @return
      */
-    @PostMapping("/t-exchange-order/getCodeByOrderId")
-    public R<List<String>> getCodeByOrderId(String goodsIds);
+    @GetMapping("/t-exchange-order/getCodeByOrderId/{goodsIds}")
+    public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds")String goodsIds);
     //查询已兑换的订单数
     @PostMapping("/t-exchange-order/getById")
     public R<Long> getExchangeById(@RequestParam("goodId") Integer goodId,@RequestParam("userId")  Long userId,@RequestParam("goodType") Integer goodType);
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 81744d1..58d079d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -118,7 +118,7 @@
     @TableField("app_coupon_id")
     private Long appCouponId;
 
-    @ApiModelProperty(value = "优惠金额")
+    @ApiModelProperty(value = "优惠券抵扣金额")
     @TableField("coupon_discount_amount")
     private BigDecimal couponDiscountAmount;
 
@@ -130,7 +130,7 @@
     @TableField("vip_discount_amount")
     private BigDecimal vipDiscountAmount;
 
-    @ApiModelProperty(value = "支付金额")
+    @ApiModelProperty(value = "支付金额(实付)")
     @TableField("payment_amount")
     private BigDecimal paymentAmount;
 
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
index 698baf7..267f10a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
@@ -21,14 +21,16 @@
     private Integer status;
     @ApiModelProperty(value = "站点id")
     private Integer siteId;
-    @ApiModelProperty(value = "充电桩ids 逗号拼接")
-    private String pileIds;
-    @ApiModelProperty(value = "充电枪ids 逗号拼接")
-    private String gunIds;
+    @ApiModelProperty(value = "充电桩id ")
+    private Integer pileId;
+    @ApiModelProperty(value = "充电枪id ")
+    private Integer gunId;
     @ApiModelProperty(value = "开始时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
     private String startTime;
     @ApiModelProperty(value = "结束时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
     private String endTime;
     @ApiModelProperty(value = "订单来源 1明星 2快电 3新电途")
     private Integer orderSource;
+    @ApiModelProperty(value = "用户ids 前端忽略")
+    private List<Long> userIds;
 }
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
index 716f7a6..ab1db5f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
@@ -1,6 +1,7 @@
 package com.ruoyi.order.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.order.api.model.TChargingOrder;
 import com.ruoyi.order.api.model.TOrderEvaluate;
 import io.swagger.annotations.ApiModel;
@@ -8,15 +9,12 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
 public class ChargingOrderVO extends TChargingOrder {
-    @ApiModelProperty(value = "订单id")
-    private Long id;
-    @ApiModelProperty(value = "用户id")
-    private Long userId;
     @ApiModelProperty(value = "站点名称")
     private String siteName;
     @ApiModelProperty(value = "充电终端名称 桩+枪")
@@ -41,4 +39,5 @@
     private Integer count;
     @ApiModelProperty(value = "1明星充电 2快电 3新电途")
     private Integer orderSource;
+
 }
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java
index 405d1c0..24ef5be 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java
@@ -23,5 +23,4 @@
     private BigDecimal vipActivity;
     @ApiModelProperty(value = "赠送会员")
     private BigDecimal grantVip;
-
 }
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
index 84e3633..120fefe 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
@@ -92,8 +92,8 @@
     private String introduce;
 
     @ApiModelProperty(value = "商品说明")
-    @TableField("explain")
-    private String explain;
+    @TableField("explains")
+    private String explains;
 
     @ApiModelProperty(value = "状态(1=上架,2=下架)")
     @TableField("status")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
index 0d5a429..f6ad529 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
@@ -24,7 +24,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_integral_rule")
 @ApiModel(value="TIntegralRule对象", description="")
-public class TIntegralRule extends BasePojo {
+public class TIntegralRule {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 7372a9a..1c3736d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -239,7 +239,6 @@
         if (user.getPhonenumber() != null) {
             user.setUserName(user.getPhonenumber());
         }
-        user.setPassword(null);
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(new Date());
         userService.updateUser(user);
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 64b5981..5f7a306 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -89,7 +89,7 @@
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
     <select id="isExitUpdate" resultType="com.ruoyi.system.api.domain.SysRole">
-		select role_name romeName from sys_role where role_name=#{roleName} and companyId =#{companyId} and  role_id != #{roleId}
+		select role_name romeName from sys_role where role_name=#{roleName} and  role_id != #{roleId}
 	</select>
 
     <insert id="insertRole" parameterType="com.ruoyi.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
@@ -97,33 +97,19 @@
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
- 			<if test="roleSort != null">role_sort,</if>
  			<if test="dataScope != null and dataScope != ''">data_scope,</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
- 			<if test="carDataAuth != null and carDataAuth != ''">carDataAuth,</if>
- 			<if test="carTrainOperAuth != null and carTrainOperAuth != ''">carTrainOperAuth,</if>
- 			<if test="contractDataAuth != null and contractDataAuth != ''">contractDataAuth,</if>
- 			<if test="companyId != null and companyId != ''">companyId,</if>
  			create_time
  		)values(
  			<if test="roleId != null and roleId != 0">#{roleId},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- 			<if test="roleSort != null">#{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			<if test="carDataAuth != null and carDataAuth != ''">#{carDataAuth},</if>
- 			<if test="carTrainOperAuth != null and carTrainOperAuth != ''">#{carTrainOperAuth},</if>
- 			<if test="contractDataAuth != null and contractDataAuth != ''">#{contractDataAuth},</if>
- 			<if test="companyId != null and companyId != ''">#{companyId},</if>
  			sysdate()
  		)
 	</insert>
@@ -133,16 +119,10 @@
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- 			<if test="roleSort != null">role_sort = #{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="carDataAuth != null and carDataAuth != ''">carDataAuth = #{carDataAuth},</if>
- 			<if test="carTrainOperAuth != null and carTrainOperAuth != ''">carTrainOperAuth = #{carTrainOperAuth},</if>
- 			<if test="contractDataAuth != null and contractDataAuth != ''">contractDataAuth = #{contractDataAuth},</if>
  			update_time = sysdate()
  		</set>
  		where role_id = #{roleId}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index b484da7..a714ab5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -224,6 +224,7 @@
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+			<if test="forbiddenRemark != null">forbidden_remark = #{forbiddenRemark},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index de60d7f..92e56a0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -83,8 +83,8 @@
      * @param goodsIds  订单号-商品类型
      * @return
      */
-    @PostMapping("/getSalesCountByGoodsIds")
-    public R<List<Integer>> getSalesCountByGoodsId(String goodsIds){
+    @GetMapping("/getSalesCountByGoodsIds/{goodsIds}")
+    public R<List<Integer>> getSalesCountByGoodsId(@PathVariable("goodsIds")String goodsIds){
         String[] split = goodsIds.split("-");
         // 取出最后一位字符 类型1查询现金购买 类型2查询积分兑换
         String s = split[split.length - 1];
@@ -117,8 +117,8 @@
      * @param goodsIds  订单号-商品类型
      * @return
      */
-    @PostMapping("/getCodeByOrderId")
-    public R<List<String>> getCodeByOrderId(String goodsIds){
+    @GetMapping("/getCodeByOrderId/{goodsIds}")
+    public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
         String[] split = goodsIds.split("-");
         List<String> strings = new ArrayList<>();
         for (String s : split) {
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
index d36e263..34496e8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -46,6 +46,6 @@
 	List<TChargingOrder> getNoInvoicedOrder(@Param("appUserId") Long appUserId, @Param("month") String month,
 	                                        @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);
 
-    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, ChargingOrderQuery dto, String startTime1, String startTime2, String endTime1, String endTime11);
+    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, @Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);
 
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 20c1eb3..e694fa4 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -55,9 +55,6 @@
             limit #{pageCurr}, #{pageSize}
         </if>
     </select>
-    
-    
-    
     <select id="getNoInvoicedOrder" resultMap="BaseResultMap">
         select * from t_charging_order where del_flag = 0 and app_user_id = #{appUserId}
         <if test="null != month and '' != month">
@@ -69,4 +66,40 @@
             limit #{pageCurr}, #{pageSize}
         </if>
     </select>
+
+    <select id="chargingOrder" resultType="com.ruoyi.order.api.vo.ChargingOrderVO">
+        select t1.*
+        from t_charging_order t1
+        where 1=1
+        <if test="null != req.code and req.code!=''">
+            and t1.code  LIKE CONCAT('%',#{req.code},'%')
+        </if>
+        <if test="null != req.userIds and req.userIds.size()>0" >
+            and t1.app_user_id in
+            <foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="req.orderType != null ">
+            and t1.order_type = #{req.orderType}
+        </if>
+        <if test="req.status != null ">
+            and t1.status = #{req.status}
+        </if>
+        <if test="req.siteId != null ">
+            and t1.site_id = #{req.siteId}
+        </if>
+        <if test="req.pileId != null ">
+            and t1.charging_pile_id = #{req.pileId}
+        </if>
+        <if test="req.gunId != null ">
+            and t1.charging_gun_id = #{req.gunId}
+        </if>
+        <if test="startTime1 != null and startTime1!=''">
+            and (t1.start_time between #{startTime1} and #{startTime2}
+        </if>
+        <if test="endTime1 != null and endTime1!=''">
+            and (t1.end_time between #{endTime1} and #{endTime2}
+        </if>
+    </select>
 </mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml
index 552b98c..4b83baa 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml
@@ -42,7 +42,7 @@
             <if test="req.status != null">
                 AND  status = #{req.status}
             </if>
-            <if test="req.otherState != null and req.otherState = 2">
+            <if test="req.otherState != null and req.otherState == 2">
                 AND  inventory = 0
             </if>
             AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}

--
Gitblit v1.7.1